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

update 20250113

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-13 21:00:23 +01:00
parent 1e3c169d49
commit 3e36dd541b
107 changed files with 366 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -336,7 +336,7 @@ namespace OnDoc.DocMgmt
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename);
op.PrintInWord(Filename, AppParams.wordprintmacro);
op.PrintInWord(Filename, AppParams.wordprintmacro, AppParams.OfficeSpleep1);
op = null;
}
if (dok.doktype == "P")

2
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -269,7 +269,7 @@ namespace OnDoc.DocMgmt
{
if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
{
MessageBox.Show("Zwingende Dokumentte können nicht abgewählt werden");
MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
dataRow[4] = 1;
return;
}

35
Client/DocMgmt/Serienbrief.cs
View File

@@ -51,6 +51,8 @@ namespace OnDoc.UIControls
//private int dokumenttypnr = 0;
private int officevorlagenr = 0;
private int profilnr = 0;
private string partnernr = "";
private string partnernr_inserted = "";
private serienbrief sb = new serienbrief();
private int serienbriefnr = 0;
private DOCGEN.DocGen dg = null;
@@ -85,8 +87,8 @@ namespace OnDoc.UIControls
{
Refresh_Lists();
Refresh_Team();
//Broadcaster().AddListener(this);
//Closing += Form_Closing;
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
private void Form_Closing(object sender, CancelEventArgs e)
@@ -122,6 +124,18 @@ namespace OnDoc.UIControls
{
ribbonbuttonsave_Click(sender, null);
}
if (message== "SBPartnersuche")
{
this.partnernr=sender.Details.ToString();
if (partnernr_inserted == partnernr)
{
return;
}
partnernr_inserted = partnernr;
add_partner(this.partnernr);
}
}
private void enable_disable_functions(int type, bool enabled)
@@ -925,10 +939,18 @@ namespace OnDoc.UIControls
private void ribbonbuttonaddpartner_Click(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
Partnersuche ps = new Partnersuche(true);
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
add_partner(ps.partnernr.ToString());
}
}
private void add_partner(string ipartnernr)
{
if (ipartnernr == "") { return; }
this.partnernr = "";
bool found = false;
foreach (System.Data.DataColumn dc in sb.dsempfaenger.Tables[0].Columns)
{
@@ -938,7 +960,7 @@ namespace OnDoc.UIControls
int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ps.partnernr.ToString(), false, true);
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ipartnernr, false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].NewRow();
@@ -946,17 +968,17 @@ namespace OnDoc.UIControls
{
dr[i] = "";
}
dr["partnernr"] = Convert.ToInt32(ps.partnernr.ToString());
dr["partnernr"] = Convert.ToInt32(ipartnernr);
dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString();
dr["STATUS"] = 0;
dr["FEHLERCODE"] = 0;
dr["IntEintragnr"] = lastid;
sb.dsempfaenger.Tables[0].Rows.Add(dr);
this.partnernr = "";
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
}
db = null;
}
}
@@ -1814,6 +1836,7 @@ namespace OnDoc.UIControls
DB db = new DB(AppParams.connectionstring);
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
init_progressbar("Dokumente archivieren", dv.Count);
dv.RowFilter = "Status = 1";
dv.Sort = "Partnernr";