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

HausTheresia

Browse Source
This commit is contained in:
Alexandra
2022-03-18 13:18:47 +01:00
parent 17aeeef690
commit ef1a8268b3
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/AwoKreisverbandPloen/Invoicing/AssistenzInvoiceCreation.cs
View File

@@ -99,12 +99,12 @@ namespace AwoKreisverbandPloen.Invoicing
foreach (var sr in serviceRecords)
{
//Klären ob EP IMMER anfällt - && sr.DistanceInMeter > 0)
if (sr.DistanceInMeter.HasValue && sr.ServiceDescription.Category.Abbreviation.Length == 2)
if (sr.DistanceInMeter.HasValue && sr.ServiceDescription.Category.Abbreviation.Length > 0)
{
if (sr.DistanceInMeter.HasValue && sr.DistanceInMeter <= 10)
catPauschale = "E1" + sr.ServiceDescription.Category.Abbreviation.ToString();
catPauschale = "E1 " + sr.ServiceDescription.Category.Abbreviation.ToString();
else //if (sr.DistanceInMeter.HasValue && sr.DistanceInMeter > 10000)
catPauschale = "E2" + sr.ServiceDescription.Category.Abbreviation.ToString();
catPauschale = "E2 " + sr.ServiceDescription.Category.Abbreviation.ToString();
var cats = DAOFactory.GenericDAO.GetAllActive<ServiceCategory>();
List<CostRatePeriodDC> crpDcs;
@@ -118,7 +118,7 @@ namespace AwoKreisverbandPloen.Invoicing
if (crp != null && crp.CostRateValue.HasValue)
{
String text = String.Format("Einsatzpauschale {0} ({1:c})", catPauschale, crp.CostRateValue);
String text = String.Format("Einsatzpauschale {0} ({1:c})", catPauschale.Substring(1,1), crp.CostRateValue);
InvoiceItem ii = null;
@@ -132,7 +132,7 @@ namespace AwoKreisverbandPloen.Invoicing
text2Item.Add(text, ii);
ii.UnitCount = 0;
ii.ItemDescription = text.Substring(0, 21);
ii.ItemDescription = text.Substring(0, 18);
ii.UnitDescription = text;
ii.AmountPerUnit = crp.CostRateValue;
ii.ItemPeriodStart = accountingPeriodStart;

24
ReportImp/HausTheresia/SettlementReport.cs
View File

@@ -20,20 +20,20 @@ namespace HausTheresia
public void SetReportDataSource(SettlementRO pRO)
{
xrCheckBox2.Checked = true;
//xrCheckBox2.Checked = true;
if (pRO.CostBearer2SupportConceptOid > 0)
{
var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
//if (pRO.CostBearer2SupportConceptOid > 0)
//{
// var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
if (c2s.SupportConcept.Customer.TerminationDate.HasValue)
{
xrCheckBox1.Text = String.Format(" Die Betreuung wurde beendet am {0:dd.MM.yyyy}",
c2s.SupportConcept.Customer.TerminationDate);
xrCheckBox2.Checked = false;
xrCheckBox1.Checked = true;
}
}
// if (c2s.SupportConcept.Customer.TerminationDate.HasValue)
// {
// xrCheckBox1.Text = String.Format(" Die Betreuung wurde beendet am {0:dd.MM.yyyy}",
// c2s.SupportConcept.Customer.TerminationDate);
// xrCheckBox2.Checked = false;
// xrCheckBox1.Checked = true;
// }
//}
bindingSource1.DataSource = pRO;