ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2025-04-08 15:47:25 +02:00
parent 339383852c 87348441f7
commit aafec67ca7
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs
View File

@@ -70,6 +70,13 @@ namespace AsSozialeDienstleistungenEV
month++;
}
}
if (invoiceReport == null)
{
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
((XtraReport)seite1).CreateDocument();
invoiceReport = seite1 as XtraReport;
}
if (allReports == null)
{
allReports = invoiceReport;

16
ReportImp/LebenshilfeRemscheid/Export/DatevExporter.cs
View File

@@ -67,7 +67,7 @@ namespace LebenshilfeRemscheid.Export
public static String GetMonatlicheRechnungenString(DateTime date, DataTable dt)
{
// select sip.Claim, ib.InvoiceDate, ib.Invoicenumber, Concat(ib.invoicnumber, ', ', org.Name, ', ', p.FirstName, ', ', p.LastName) AS Verwendung, ib.Oid
// select sip.Claim, ib.InvoiceDate, ib.Invoicenumber, Concat(ib.invoicnumber, ', ', org.Name, ', ', p.FirstName, ', ', p.LastName) AS Verwendung, ib.Oid, org.Debitornumber
StringBuilder sb = new StringBuilder();
foreach (DataRow row in dt.Rows)
{
@@ -82,7 +82,14 @@ namespace LebenshilfeRemscheid.Export
sb.Append(";S;EUR;1;");
sb.Append(String.Format("{0:0.00}", row[0])); //Betrag Basiswährung
sb.Append(";EUR;");
sb.Append("30150;"); //Konto
if(row[6] != null && row[6].ToString().Length > 2)
{
sb.Append(String.Format("{0};", row[6])); //Konto
}
else
{
sb.Append("30150;"); //Konto
}
sb.Append("4001;"); // Erlöskonto
sb.Append(";"); //AB: Achtung falls Einführung Storno hier 20; und Soll wird zu Haben
sb.Append(String.Format("{0:ddMM}", row[1]));
@@ -149,7 +156,8 @@ namespace LebenshilfeRemscheid.Export
ib.Invoicenumber,
Concat(p.LastName, ', ', p.FirstName) AS Verwendung,
c2s.CustomerRefenrenceNumber,
ib.Oid
ib.Oid,
org.Debitornumber
from
person p
inner join customer c on c.personoid = p.oid
@@ -160,7 +168,7 @@ namespace LebenshilfeRemscheid.Export
inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
inner join serviceinvoice si on si.invoicebaseoid = ib.oid
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' AND ib.IsActive = 1 AND ib.`IsExported` = 0
order by ib.Invoicenumber
";

46
ReportImp/PerspektivenEV/LwvAbgerechneteFls.Designer.cs generated
View File

@@ -30,9 +30,9 @@ namespace PerspektivenEV
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LwvAbgerechneteFls));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LwvAbgerechneteFls));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -49,7 +49,8 @@ namespace PerspektivenEV
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -64,7 +65,6 @@ namespace PerspektivenEV
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldDifferenz = new DevExpress.XtraReports.UI.CalculatedField();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -254,20 +254,28 @@ namespace PerspektivenEV
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrLabel3});
this.lblHeader});
this.ReportHeader.HeightF = 57.22917F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel3
// xrPictureBox1
//
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(523.125F, 23F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abgerechnete FLS im gewählten Jahr pro Bereich";
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(847.5418F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(231.4583F, 57.22917F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// lblHeader
//
this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblHeader.Multiline = true;
this.lblHeader.Name = "lblHeader";
this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblHeader.SizeF = new System.Drawing.SizeF(639.7914F, 23F);
this.lblHeader.StylePriority.UseFont = false;
this.lblHeader.Text = "Abgerechnete FLS im gewählten Jahr pro Bereich für Kostenträger BTHG";
//
// GroupFooter1
//
@@ -413,14 +421,6 @@ namespace PerspektivenEV
this.fieldDifferenz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldDifferenz.Name = "fieldDifferenz";
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(847.5418F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(231.4583F, 57.22917F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
@@ -438,7 +438,7 @@ namespace PerspektivenEV
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(60F, 30F, 50F, 51F);
this.PageHeight = 827;
this.PageHeight = 826;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
@@ -474,7 +474,7 @@ namespace PerspektivenEV
private DevExpress.XtraReports.UI.CalculatedField fieldDifferenz;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel lblHeader;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell75;

1
ReportImp/PerspektivenEV/LwvAbgerechneteFls.cs
View File

@@ -51,6 +51,7 @@ namespace PerspektivenEV
datum = datum.AddMonths(1);
DateTime end = datum;
int month = end.Month - start.Month + 1;
lblHeader.Text += String.Format(" bis zum {0:dd.MM.yyyy}", datum.AddDays(-1));
var allInvoices = DAOFactory.GenericDAO.GetAllActive<ServiceInvoice>();
var oidList = new List<long>() { 198, 199, 202, 203 }; // nur für LWV, Oberbayern, Landesamt Saarland, Breisgau