SKFLeverkusenJuHi/Invoicing/CollectiveInvoiceCreation - umstellung auf Einzelrechnung
This commit is contained in:
@@ -92,11 +92,12 @@ namespace SkfLeverkusenJuHi
|
||||
|
||||
if (iDC.InvoiceBase.InvoiceId == "Sammelrechnung")
|
||||
{
|
||||
var seite1 = new Sammelrechnung();
|
||||
var anhang = new ServiceInvoiceReport();
|
||||
//var seite1 = new Sammelrechnung();
|
||||
var ro = ServiceInvoiceRO.Create(iDC);
|
||||
|
||||
seite1.SetReportDataSource(ro);
|
||||
seite1.CreateDocument();
|
||||
//seite1.SetReportDataSource(ro);
|
||||
//seite1.CreateDocument();
|
||||
|
||||
if (ro.ServiceInvoicePeriods.Count > 0)
|
||||
{
|
||||
@@ -107,14 +108,13 @@ namespace SkfLeverkusenJuHi
|
||||
newro.ServiceInvoicePeriods = new List<ServiceInvoicePeriodRO>();
|
||||
newro.ServiceInvoicePeriods.Add(sip);
|
||||
|
||||
var anhang = new ServiceInvoiceReport();
|
||||
//var anhang = new ServiceInvoiceReport();
|
||||
anhang.SetReportDataSource(newro);
|
||||
anhang.CreateDocument();
|
||||
seite1.Pages.AddRange(anhang.Pages);
|
||||
}
|
||||
}
|
||||
|
||||
invoiceReport = seite1;
|
||||
invoiceReport = anhang;
|
||||
}
|
||||
|
||||
else
|
||||
|
||||
@@ -22,11 +22,13 @@ namespace SkfLeverkusenJuHi.Invoicing
|
||||
private DateTime? end = null;
|
||||
private CostBearer2SupportConcept CB2SC = null;
|
||||
|
||||
public override void SetInvoiceId(ServiceInvoice invoice)
|
||||
{
|
||||
invoice.InvoiceBase.InvoiceId = "Sammelrechnung";
|
||||
invoice.InvoiceBase.InvoiceTypeText = "Sammelrechnung";
|
||||
}
|
||||
// war ursprüngliche als Sammelrechnung geplant, aber am Ende doch Einzelrechnungen
|
||||
// Sammelrechnung aus Projekt entfernt, ist aber noch im Ordner
|
||||
//public override void SetInvoiceId(ServiceInvoice invoice)
|
||||
//{
|
||||
// invoice.InvoiceBase.InvoiceId = "Sammelrechnung";
|
||||
// invoice.InvoiceBase.InvoiceTypeText = "Sammelrechnung";
|
||||
//}
|
||||
|
||||
public override void SetInvoiceItems(ServiceInvoice invoice,
|
||||
ServiceInvoicePeriod serviceInvoicePeriod,
|
||||
|
||||
@@ -820,7 +820,7 @@ namespace SKFLeverkusenJuHi
|
||||
this.xrLabel19.Multiline = true;
|
||||
this.xrLabel19.Name = "xrLabel19";
|
||||
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel19.SizeF = new System.Drawing.SizeF(260.5418F, 20F);
|
||||
this.xrLabel19.SizeF = new System.Drawing.SizeF(515.9214F, 20F);
|
||||
this.xrLabel19.StylePriority.UseBackColor = false;
|
||||
this.xrLabel19.StylePriority.UseFont = false;
|
||||
this.xrLabel19.StylePriority.UseTextAlignment = false;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -88,12 +88,6 @@
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Sammelrechnung.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Sammelrechnung.Designer.cs">
|
||||
<DependentUpon>Sammelrechnung.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ServiceInvoiceReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -136,10 +130,6 @@
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Sammelrechnung.resx">
|
||||
<DependentUpon>Sammelrechnung.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="ServiceInvoiceReport.resx">
|
||||
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
Reference in New Issue
Block a user