shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20250326

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-26 20:46:46 +01:00
parent c767e2ed82
commit e0d3dbbbff
460 changed files with 122504 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Client/UIControls/DokList.cs
View File

@@ -1620,7 +1620,7 @@ namespace OnDoc.UICintrols
Versandpaket vp = new Versandpaket();
vp.Dokument = new List <Versanddokument>();
vp.partnernr = Convert.ToInt32(datarow["partner-nr"]);
vp.Versandoption = "1";
vp.Versandoption = "B1";
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
@@ -1632,8 +1632,9 @@ namespace OnDoc.UICintrols
}
}
OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.Show();
vs.ShowDialog();
dokumentAnVersandstrasseToolStripMenuItem.Visible = true;
refresh_dokumente();
}

79
Client/UIControls/Serienbrief.Designer.cs generated
View File

@@ -29,8 +29,8 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv5 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv6 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv7 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
@@ -48,6 +48,7 @@
this.label2 = new System.Windows.Forms.Label();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.grpDruckstapel = new System.Windows.Forms.GroupBox();
this.btnblexport = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -126,7 +127,7 @@
this.ribbonButtonDruckstapel = new System.Windows.Forms.RibbonButton();
this.ribbonPanel9 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonArchivierenUndAbschlessen = new System.Windows.Forms.RibbonButton();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton();
this.ribbonTabPruefung = new System.Windows.Forms.RibbonTab();
this.ribbonPanel10 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonGeprueft = new System.Windows.Forms.RibbonButton();
@@ -134,7 +135,6 @@
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.btnblexport = new System.Windows.Forms.Button();
this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.GrpDokumentInhalt.SuspendLayout();
@@ -319,6 +319,17 @@
this.grpDruckstapel.Text = "Druckstapel";
this.grpDruckstapel.Visible = false;
//
// btnblexport
//
this.btnblexport.Location = new System.Drawing.Point(232, 136);
this.btnblexport.Name = "btnblexport";
this.btnblexport.Size = new System.Drawing.Size(239, 23);
this.btnblexport.TabIndex = 22;
this.btnblexport.Text = "Banklagernd-Dokumente exportieren";
this.btnblexport.UseVisualStyleBackColor = true;
this.btnblexport.Visible = false;
this.btnblexport.Click += new System.EventHandler(this.btnblexport_Click);
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.MistyRose;
@@ -369,15 +380,15 @@
//
// treeviewDruckstapel
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black;
this.treeviewDruckstapel.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
this.treeviewDruckstapel.BeforeTouchSize = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.Dock = System.Windows.Forms.DockStyle.Left;
//
@@ -754,7 +765,7 @@
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(303, 95);
this.panelLoad.Location = new System.Drawing.Point(147, 103);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(832, 94);
this.panelLoad.TabIndex = 6;
@@ -831,15 +842,15 @@
//
// treeViewAdv1
//
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 563);
this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
@@ -1228,7 +1239,7 @@
//
this.ribbonPanel9.ButtonMoreVisible = false;
this.ribbonPanel9.Items.Add(this.RibbonButtonArchivierenUndAbschlessen);
this.ribbonPanel9.Items.Add(this.ribbonButton1);
this.ribbonPanel9.Items.Add(this.ribbonButtonVersandstrasse);
this.ribbonPanel9.Name = "ribbonPanel9";
this.ribbonPanel9.Text = "";
//
@@ -1243,12 +1254,15 @@
this.RibbonButtonArchivierenUndAbschlessen.Click += new System.EventHandler(this.RibbonButtonArchivierenUndAbschlessen_Click);
this.RibbonButtonArchivierenUndAbschlessen.CanvasChanged += new System.EventHandler(this.RibbonButtonArchivierenUndAbschlessen_CanvasChanged);
//
// ribbonButton1
// ribbonButtonVersandstrasse
//
this.ribbonButton1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton1.Image")));
this.ribbonButton1.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton1.LargeImage")));
this.ribbonButton1.Name = "ribbonButton1";
this.ribbonButton1.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton1.SmallImage")));
this.ribbonButtonVersandstrasse.Enabled = false;
this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32;
this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32;
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.ShowDoc_24x24_32;
this.ribbonButtonVersandstrasse.Text = "Versandstrasse";
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click);
//
// ribbonTabPruefung
//
@@ -1312,17 +1326,6 @@
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// btnblexport
//
this.btnblexport.Location = new System.Drawing.Point(232, 136);
this.btnblexport.Name = "btnblexport";
this.btnblexport.Size = new System.Drawing.Size(239, 23);
this.btnblexport.TabIndex = 22;
this.btnblexport.Text = "Banklagernd-Dokumente exportieren";
this.btnblexport.UseVisualStyleBackColor = true;
this.btnblexport.Visible = false;
this.btnblexport.Click += new System.EventHandler(this.btnblexport_Click);
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1476,7 +1479,7 @@
private System.Windows.Forms.RibbonButton ribbonbuttonGeprueft;
private System.Windows.Forms.RibbonButton ribbonbuttonAbgelehnt;
private System.Windows.Forms.RibbonButton ribbonButtonToApproval;
private System.Windows.Forms.RibbonButton ribbonButton1;
private System.Windows.Forms.RibbonButton ribbonButtonVersandstrasse;
private System.Windows.Forms.Button btnblexport;
private Syncfusion.Windows.Forms.FolderBrowser folderBrowser1;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;

36
Client/UIControls/Serienbrief.cs
View File

@@ -206,11 +206,13 @@ namespace OnDoc.UIControls
RibbonButtonGenerateSB.Enabled = false;
ribbonButtonDruckstapel.Enabled = false;
RibbonButtonArchivierenUndAbschlessen.Enabled = false;
ribbonButtonVersandstrasse.Enabled = false;
}
if (type == 2)
{
RibbonButtonGenerateSB.Enabled = false;
RibbonButtonArchivierenUndAbschlessen.Enabled = false;
ribbonButtonVersandstrasse.Enabled = false;
ribbonButtonDruckstapel.Enabled = false;
}
if (type == 3)
@@ -913,6 +915,7 @@ namespace OnDoc.UIControls
if (fehlerhaft == 0 && inbearbeitung == 0 && generiert > 0)
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonVersandstrasse.Enabled = true;
ribbonButtonDruckstapel.Enabled = true;
if (cbdigitaleunterschrfiten.Checked)
@@ -921,12 +924,14 @@ namespace OnDoc.UIControls
{
this.ribbonButtonDruckstapel.Enabled = false;
this.RibbonButtonArchivierenUndAbschlessen.Enabled = false;
this.ribbonButtonVersandstrasse.Enabled = false;
this.ribbonButtonToApproval.Enabled = true;
}
else
{
this.ribbonButtonDruckstapel.Enabled = true;
this.RibbonButtonArchivierenUndAbschlessen.Enabled = true;
this.ribbonButtonVersandstrasse.Enabled = true;
this.ribbonButtonToApproval.Enabled = false;
}
}
@@ -2816,6 +2821,37 @@ namespace OnDoc.UIControls
}
private bool check_versandstrasse()
{
bool result = false;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Versandstrasse_moeglich"]) == true)
{
result = true;
}
db = null;
return result;
}
private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
{
List<Versandpaket>versandpakete = new List<Versandpaket>();
Versandpaket vp = new Versandpaket();
vp.Dokument = new List<Versanddokument>();
vp.isSerienbrief = true;
vp.sb = sb;
vp.partnernr = 0;
vp.Versandoption = "B1";
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
vp.PaketNr = "0";
versandpakete.Add(vp);
OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.ShowDialog();
}
}
}

18
Client/UIControls/Serienbrief.resx
View File

@@ -128,24 +128,6 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">