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

VkmRietberg: Prüfung angepasst, ob es sich um eine Assistenzrechnung handelt

Browse Source
This commit is contained in:
Kojo
2023-11-20 16:58:45 +01:00
parent da377583b6
commit d657e4292c
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReportImp/VkmRietberg/BudgetnachweisAnhang.cs
View File

@@ -1,4 +1,6 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using DevExpress.XtraReports.UI;
@@ -14,7 +16,8 @@ namespace VkmRietberg
public void SetReportDataSource(BudgetnachweisAnhangRO pRO)
{
if (pRO.SettlementDC.RecipientOrganisation.ToLower().Contains("ass"))
var organisation = DAOFactory.GenericDAO.LoadByID<Organisation>(pRO.Costbearer2SupportConceptDC.CostBearer.OrganisationOid);
if (organisation != null && organisation.Name.ToLower().Contains("ass"))
{
xrLabel1.Text = xrLabel1.Text.Replace("FL", "ASS");
xrLabel1.Text = xrLabel1.Text.Replace("Fachleistungs", "Assistenz");

3
ReportImp/VkmRietberg/SettlementReport.cs
View File

@@ -19,7 +19,8 @@ namespace VkmRietberg.Alt
{
bool isDefaultSpitzabrechnung = false;
bool assistenzRechnung = false;
if (pRO.RecipientOrganisation.ToLower().Contains("ass"))
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
if (cb2sc.CostBearer.Organisation != null && cb2sc.CostBearer.Organisation.Name.ToLower().Contains("ass"))
{
assistenzRechnung = true;
}

10
ReportImp/VkmRietberg/SettlementReport2.cs
View File

@@ -7,6 +7,8 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Text.RegularExpressions;
using BS.Shared.Extensions;
using BeWo.Data.Access;
using BeWo.Data.Entities;
namespace VkmRietberg
{
@@ -26,9 +28,11 @@ namespace VkmRietberg
decimal rateFactor = 1;
bool assistenzRechnung = false;
if (pRO.RecipientOrganisation.ToLower().Contains("ass"))
{
assistenzRechnung = true;
var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(pRO.InvoiceBaseOid.Value);
var cb = ib.CostBearer2SupportConcept.CostBearer;
if (cb.Organisation != null && cb.Organisation.Name.ToLower().Contains("ass"))
{
assistenzRechnung = true;
}
foreach (var ii in pRO.InvoiceItems)