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

ReportImp/ABCBetreuungenReports/Invoicing/CustomSettlementInvoiceCreation.cs

@@ -135,47 +135,47 @@ namespace ABCBetreuungenReports.Invoicing
 
 			return invoiceItem;
 		}
-		public override void CalculateInvoiceItemAmounts(Settlement2DC si)
-		{
-			decimal maxApprovedFls = si.ApprovedFLS ?? 0;
+        public override void CalculateInvoiceItemAmounts(Settlement2DC si)
+        {
+            decimal maxApprovedFls = si.ApprovedFLS ?? 0;
 
-			foreach (var ii in si.InvoiceItems)
-			{
-				// ANPASSUNG (Fahrtkosten sollen nicht vom Budget abgezogen werden
-				if (ii.UnitCount.HasValue)
-				{
-				// ANPASSUNG ENDE
-					var unitCountBudget = Math.Round(ii.UnitCountBudget ?? ii.UnitCount ?? 0, 2, MidpointRounding.AwayFromZero);
-					if (maxApprovedFls < unitCountBudget && ii.ItemDescription != "Kontaktpauschale")
-						unitCountBudget = maxApprovedFls;
+            foreach (var ii in si.InvoiceItems)
+            {
+                // ANPASSUNG (Fahrtkosten sollen nicht vom Budget abgezogen werden
+                if (ii.UnitCount.HasValue && ii.ItemDescription != "Kontaktpauschale")
+                {
+                    // ANPASSUNG ENDE
+                    var unitCountBudget = Math.Round(ii.UnitCountBudget ?? ii.UnitCount ?? 0, 2, MidpointRounding.AwayFromZero);
+                    if (maxApprovedFls < unitCountBudget /*&& ii.ItemDescription != "Kontaktpauschale"*/)
+                        unitCountBudget = maxApprovedFls;
 
-					maxApprovedFls -= unitCountBudget;
+                    maxApprovedFls -= unitCountBudget;
 
-					if (unitCountBudget < ii.UnitCount)
-					{
-						ii.UnitCount = unitCountBudget;
-					}
-					if (ii.AmountPerUnit.HasValue)
-					{
-						if (!String.IsNullOrEmpty(ii.ItemDescription) && ii.ItemDescription == "Fehlkontakte")
-						{
-							ii.AmountPerUnit = ii.AmountPerUnit * ii.ProzentAbrechenbar / 100;
-						}
-						ii.AmountTotal = ii.UnitCount.Value * ii.AmountPerUnit.Value;
-						if (ii.RateFactor.HasValue && ii.RateFactor.Value != 0)
-							ii.GrossAmountTotal = Math.Round(ii.AmountTotal.Value * ((100m + ii.RateFactor.Value) / 100m), 2,
-								MidpointRounding.AwayFromZero);
-						else
-							ii.GrossAmountTotal = ii.AmountTotal;
+                    if (unitCountBudget < ii.UnitCount)
+                    {
+                        ii.UnitCount = unitCountBudget;
+                    }
+                    if (ii.AmountPerUnit.HasValue)
+                    {
+                        if (!String.IsNullOrEmpty(ii.ItemDescription) && ii.ItemDescription == "Fehlkontakte")
+                        {
+                            ii.AmountPerUnit = ii.AmountPerUnit * ii.ProzentAbrechenbar / 100;
+                        }
+                        ii.AmountTotal = ii.UnitCount.Value * ii.AmountPerUnit.Value;
+                        if (ii.RateFactor.HasValue && ii.RateFactor.Value != 0)
+                            ii.GrossAmountTotal = Math.Round(ii.AmountTotal.Value * ((100m + ii.RateFactor.Value) / 100m), 2,
+                                MidpointRounding.AwayFromZero);
+                        else
+                            ii.GrossAmountTotal = ii.AmountTotal;
 
-					}
-					if (ii.MaxApprovedUnitCount < ii.UnitCount)
-					{
-						ii.MaxApprovedUnitCount = ii.UnitCount;
-					}
-				}
-			}
+                    }
+                    if (ii.MaxApprovedUnitCount < ii.UnitCount)
+                    {
+                        ii.MaxApprovedUnitCount = ii.UnitCount;
+                    }
+                }
+            }
 
-		}
-	}
+        }
+    }
 }

ReportImp/SozialeDiensteNiederrhein/InvoiceCustomerReport.Designer.cs

@@ -246,8 +246,8 @@ namespace SozialeDiensteNiederrhein
             this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 131F);
             this.lblAddress.StylePriority.UseFont = false;
-            this.lblAddress.Text = "1[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLas" +
-    "tName]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
+            this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" +
+    "Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
             // 
             // xrTable3
             // 

ReportImp/SozialeDiensteNiederrhein/SettlementReport.Designer.cs

@@ -611,7 +611,7 @@ namespace SozialeDiensteNiederrhein.Alt
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 151.3335F;
+            this.bottomMarginBand1.HeightF = 156.7501F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // GroupHeader1
@@ -959,7 +959,7 @@ namespace SozialeDiensteNiederrhein.Alt
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new DevExpress.Drawing.DXMargins(97F, 74F, 208.3333F, 151.3335F);
+            this.Margins = new DevExpress.Drawing.DXMargins(97F, 74F, 208.3333F, 156.7501F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;