MH: DiakonischesWerkMuelheimTwg Barrechnung

ReportImp/DiakonischesWerkMuelheimTwg/DiakonischesWerkMuelheimTwg.csproj

@@ -61,6 +61,7 @@
     <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Invoicing\BarbetragInvoiceCreation.cs" />
+    <Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
     <Compile Include="Invoicing\PflegeInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

ReportImp/DiakonischesWerkMuelheimTwg/Invoicing/BarbetragInvoiceCreation.cs

@@ -48,7 +48,7 @@ namespace DiakonischesWerkMuelheimTwg.Invoicing
                 serviceInvoicePeriod.End.HasValue && serviceInvoicePeriod.End.Value.Day < DateTime.DaysInMonth(serviceInvoicePeriod.End.Value.Year, serviceInvoicePeriod.End.Value.Month))
                 {
                     var tage = Convert.ToDecimal((serviceInvoicePeriod.End.Value - serviceInvoicePeriod.Start.Value).TotalDays + 1);
-                    var tagessatz = billingData.AmountTotal / DateTime.DaysInMonth(serviceInvoicePeriod.End.Value.Year, serviceInvoicePeriod.End.Value.Month);
+                    var tagessatz = billingData.AmountTotal / 30;
 
                     billingData.AmountTotal = tage * tagessatz;
                     billingData.GrossAmountTotal = tage * tagessatz;

ReportImp/DiakonischesWerkMuelheimTwg/RechnungBarbetrag.Designer.cs

@@ -240,8 +240,7 @@ namespace DiakonischesWerkMuelheimTwg
             this.lblAbrechnungTitel.SizeF = new System.Drawing.SizeF(650F, 21.20831F);
             this.lblAbrechnungTitel.StylePriority.UseBackColor = false;
             this.lblAbrechnungTitel.StylePriority.UseFont = false;
-            this.lblAbrechnungTitel.Text = "[BusinessPartnerId] / Rechnung: [InvoiceNumber] - Barbetrag [InvoiceDateTime!MMMM" +
-    " yyyy]";
+            this.lblAbrechnungTitel.Text = "[BusinessPartnerId] / Rechnung über Barbetrag [InvoiceDateTime!MMMM yyyy]";
             this.lblAbrechnungTitel.WordWrap = false;
             // 
             // xrLabel7
@@ -249,7 +248,7 @@ namespace DiakonischesWerkMuelheimTwg
             this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")});
             this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1.041667F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -258,14 +257,14 @@ namespace DiakonischesWerkMuelheimTwg
             // 
             // lblAdresse
             // 
-            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.875F);
             this.lblAdresse.Multiline = true;
             this.lblAdresse.Name = "lblAdresse";
             this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 90.66667F);
             this.lblAdresse.StylePriority.UseFont = false;
-            this.lblAdresse.Text = "abc[RecipientContactPerson]\r\n[RecipientDivision]\r\n[RecipientStreet]\r\n[RecipientPo" +
-    "stCodeAndTown]";
+            this.lblAdresse.Text = "[RecipientContactPerson]\r\n[RecipientDivision]\r\n[RecipientStreet]\r\n[RecipientPostC" +
+    "odeAndTown]";
             // 
             // ruleRateFactorNull
             //