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

PerspektivenEV LWV zu Landeswohlfahrtsverband

Browse Source
This commit is contained in:
Alexandra
2023-07-06 08:30:30 +02:00
parent 89f87f6344
commit 36ebbd2c01
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs generated
View File

@@ -36,6 +36,7 @@ namespace PerspektivenEV
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule();
@@ -73,7 +74,6 @@ namespace PerspektivenEV
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -119,6 +119,21 @@ namespace PerspektivenEV
this.GroupFooter.HeightF = 213.8335F;
this.GroupFooter.Name = "GroupFooter";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(631F, 19.99998F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.WordWrap = false;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
@@ -197,8 +212,8 @@ namespace PerspektivenEV
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F);
this.lblAdresse.StylePriority.UseFont = false;
this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
"tStreet]\r\n[RecipientPostCodeAndTown]";
this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientAddressLine1]\r\n[RecipientDivision]\r\n[Recipient" +
"Street]\r\n[RecipientPostCodeAndTown]";
//
// xrLabel3
//
@@ -614,21 +629,6 @@ namespace PerspektivenEV
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(631F, 19.99998F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.WordWrap = false;
//
// Sammelrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

2
ReportImp/PerspektivenEV/CustomReportCreator.cs
View File

@@ -48,7 +48,7 @@ namespace PerspektivenEV
{
XtraReport invoiceReport = null;
if (iDC.InvoiceBase.RecipientOrganisation != "LWV Hessen" && iDC.InvoiceBase.Type.ToString() == "Service"
if (iDC.InvoiceBase.RecipientOrganisation != "Landeswohlfahrtsverband Hessen" && iDC.InvoiceBase.Type.ToString() == "Service"
&& iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory.Name.Contains("BW"))
{
XtraReport masterReport = new XtraReport();

4
ReportImp/PerspektivenEV/Export/DatevExporter.cs
View File

@@ -439,7 +439,7 @@ namespace PerspektivenEV.Export
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
inner join invoiceitem ii on ii.serviceinvoiceperiodoid = sip.oid
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
AND ib.RecipientOrganisation <> 'LWV Hessen'
AND ib.RecipientOrganisationOid <> 4
ORDER BY invoiceoid, ii.ItemDescription
";
@@ -504,7 +504,7 @@ namespace PerspektivenEV.Export
JOIN serviceinvoiceperiod sip ON sip.serviceinvoiceoid = si.oid
JOIN invoiceitem ii ON ii.serviceinvoiceperiodoid = sip.oid
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' AND ib.IsActive = 1
AND ib.RecipientOrganisation = 'LWV Hessen'
AND ib.RecipientOrganisationOid = 4
ORDER BY ii.ItemDescription
";

2
ReportImp/PerspektivenEV/Invoicing/CustomInvoiceFactory.cs
View File

@@ -20,7 +20,7 @@ namespace PerspektivenEV.Invoicing
{
return new CustomInvoiceCreation();
}
else if (sr.CostBearer.Name.Contains("LWV Hessen"))
else if (sr.CostBearer.Name.Contains("LWV Hessen") || sr.CostBearer.Name.Contains("Landeswohlfahrtsverband Hessen"))
{
return new CollectiveInvoiceCreation();
}