Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master
This commit is contained in:
@@ -51,7 +51,7 @@
|
||||
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
|
||||
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
|
||||
<Compile Include="Export\CustomDataExporter.cs" />
|
||||
<Compile Include="Export\DatevExporter.cs" />
|
||||
<Compile Include="Export\ExactExporter.cs" />
|
||||
<Compile Include="Mitarbeiterarbeitszeitkonto.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Akgg.Export
|
||||
{
|
||||
public override QueryDC CreateQuery(QueryDC query)
|
||||
{
|
||||
return DatevExporter.CreateQuery(query);
|
||||
return ExactExporter.CreateQuery(query);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,260 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
|
||||
namespace Akgg.Export
|
||||
{
|
||||
public class DatevExporter
|
||||
{
|
||||
|
||||
public static QueryDC CreateQuery(QueryDC query)
|
||||
{
|
||||
DateTime dt = DateTime.Now;
|
||||
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
|
||||
|
||||
query.FileName = String.Format("Exact Export {0:yyyyMM}.csv", dt);
|
||||
query.QueryResult = GetAbrechnungenString(dt);
|
||||
return query;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public static String GetAbrechnungenString(DateTime date)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
//sb.AppendLine("Betrag;Konto;Gegenkonto;Belegdatum;Rechnungsnummer;Buchungstext;Kostenstelle");
|
||||
|
||||
//sb.AppendLine("Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle");
|
||||
sb.AppendLine("regelnummer; dagb_type; dagbknr; periode; bkjrcode; bkstnr; oms25; Date; Empty; debnr; crdnr; Empty; bedrag; drbk_in_val; " +
|
||||
"valcode; koers; kredbep; bdrkredbep; vervdatfak; vervdatkrd; Empty; Empty; weeknummer; betaalref; betwijze; grek_bdr; Empty; Empty; Empty; Empty; Empty; storno; " +
|
||||
"Empty; Empty; Empty; Empty; Empty; Empty; Empty; Empty");
|
||||
sb.AppendLine("Line number; Type of journal; Journal; Period; Financial year; Entry number; Description; Date; -; Debtor; Creditor number; -; Amount; Journalize in FC; " +
|
||||
"Currency; Exchange rate; Payment charge / Payment discount; Amount Payment charge / Payment discount; Due date invoice; Due date payment charge / payment discount; -; -; Week number; Payment reference; Payment method; Amount blocked account; -; -; -; -; -; Reversal entry; " +
|
||||
"-; -; -; -; -; -; -; -");
|
||||
|
||||
|
||||
var s = GetMonatlicheRechnungenString(date);
|
||||
if (!String.IsNullOrWhiteSpace(s))
|
||||
{
|
||||
sb.Append(s);
|
||||
}
|
||||
|
||||
s = GetMonatlicheBetraegeString(date);
|
||||
if (!String.IsNullOrWhiteSpace(s))
|
||||
{
|
||||
if (sb.Length > 0)
|
||||
sb.AppendLine();
|
||||
|
||||
sb.Append(s);
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
public static String GetMonatlicheRechnungenString(DateTime date)
|
||||
{
|
||||
var sql = GetMonatlicheRechnungenSql(date);
|
||||
|
||||
/*
|
||||
sip.Claim,
|
||||
c.DebitorNumber,
|
||||
ib.InvoiceDate,
|
||||
ib.invoicenumber,
|
||||
c.CostCenter,
|
||||
c2s.Oid,
|
||||
ib.InvoiceId,
|
||||
org.DebitorNumber
|
||||
*/
|
||||
|
||||
//"Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle"
|
||||
var dt = ExecuteQuery(sql, date);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
foreach (DataRow row in dt.Rows)
|
||||
{
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
sb.AppendLine();
|
||||
}
|
||||
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
|
||||
lastDate = lastDate.AddMonths(1).AddDays(-1);
|
||||
|
||||
sb.Append(String.Format("{0:ddMM}", lastDate));
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[1]));
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[7]));
|
||||
sb.Append(";");
|
||||
String buchungstext = "";
|
||||
long? c2sOid = (long?)row[5];
|
||||
|
||||
if (c2sOid.HasValue)
|
||||
{
|
||||
var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(c2sOid.Value);
|
||||
|
||||
var c = c2s.SupportConcept.Customer;
|
||||
|
||||
buchungstext = String.Format("{0}, {1}", c.Person.LastName, c.Person.FirstName);
|
||||
}
|
||||
|
||||
sb.Append(buchungstext);
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[3]));
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0:0.00}", row[0]));
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[4]));
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
public static String GetMonatlicheBetraegeString(DateTime date)
|
||||
{
|
||||
var sql = GetMonatlicheBetraegeLvrSql(date);
|
||||
|
||||
/*
|
||||
'Betrag',
|
||||
c.DebitorNumber,
|
||||
c.CostCenter,
|
||||
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
|
||||
cb2sc.Oid
|
||||
*/
|
||||
|
||||
//"Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle"
|
||||
var dt = ExecuteQuery(sql, date);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
foreach (DataRow row in dt.Rows)
|
||||
{
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
sb.AppendLine();
|
||||
}
|
||||
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
|
||||
lastDate = lastDate.AddMonths(1).AddDays(-1);
|
||||
|
||||
sb.Append(String.Format("{0:ddMM}", lastDate));
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[1]));
|
||||
sb.Append(";");
|
||||
sb.Append("8010"); // Erlöskonto
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0}", row[3]));
|
||||
sb.Append(";");
|
||||
//sb.Append(""); // Rechnungsnummer leer
|
||||
sb.Append(";");
|
||||
sb.Append(String.Format("{0:0.00}", row[0]));
|
||||
sb.Append(";");
|
||||
sb.Append("3010");
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
private static Dictionary<long, decimal> CreateHourlyRateDict(List<long> catOids, DateTime date)
|
||||
{
|
||||
Dictionary<long, decimal> dict = new Dictionary<long, decimal>();
|
||||
|
||||
foreach (var oid in catOids)
|
||||
{
|
||||
var cat = DAOFactory.GenericDAO.LoadByID<ServiceCategory>(oid);
|
||||
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
|
||||
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, date);
|
||||
if (cp != null && cp.CostRateValue.HasValue)
|
||||
dict.Add(oid, cp.CostRateValue.Value);
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
|
||||
private static String GetMonatlicheRechnungenSql(DateTime date)
|
||||
{
|
||||
|
||||
String sql = @"
|
||||
select
|
||||
sip.Claim,
|
||||
c.DebitorNumber,
|
||||
ib.InvoiceDate,
|
||||
ib.invoicenumber,
|
||||
c.CostCenter,
|
||||
c2s.Oid,
|
||||
ib.InvoiceId,
|
||||
org.DebitorNumber
|
||||
from
|
||||
person p
|
||||
inner join customer c on c.personoid = p.oid
|
||||
inner join supportconcept sc on sc.customeroid = c.oid
|
||||
inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
|
||||
inner join costbearer cb on c2s.costbeareroid = cb.oid
|
||||
inner join organisation org on org.costbeareroid = cb.oid
|
||||
inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
|
||||
inner join serviceinvoice si on si.invoicebaseoid = ib.oid
|
||||
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
|
||||
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
|
||||
order by ib.invoicenumber
|
||||
";
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
private static String GetMonatlicheBetraegeLvrSql(DateTime date)
|
||||
{
|
||||
String sql = @"
|
||||
SELECT
|
||||
IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )),
|
||||
ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ) * ((100 + crpRateFactor.`CostRateValue`)/100), 2)) AS 'Betrag',
|
||||
c.DebitorNumber,
|
||||
c.CostCenter,
|
||||
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
|
||||
cb2sc.Oid
|
||||
FROM `supportconcept` sc
|
||||
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
|
||||
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
|
||||
LEFT JOIN
|
||||
(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp
|
||||
WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW()))
|
||||
AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
|
||||
INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
|
||||
INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
|
||||
INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
|
||||
LEFT JOIN
|
||||
(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2
|
||||
INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
|
||||
INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
|
||||
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 GROUP BY sr2.`CostBearer2SupportConceptOid`)
|
||||
AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
|
||||
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1
|
||||
and (sr.`GeleisteteFLM` is not null)
|
||||
and org.Name = 'LVR'
|
||||
ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
|
||||
";
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
public static DataTable ExecuteQuery(String sql, DateTime dt)
|
||||
{
|
||||
var newsql = sql;
|
||||
newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:dd.MM.yyyy}", dt));
|
||||
newsql = newsql.Replace(":Belegnr", String.Format("{0:yyMM}", dt));
|
||||
newsql = newsql.Replace(":Monat_MM", String.Format("{0:MM}", dt));
|
||||
newsql = newsql.Replace(":Monat_Start", String.Format("{0:yyyy-MM}-01", dt));
|
||||
dt = dt.AddMonths(1);
|
||||
newsql = newsql.Replace(":Monat_End", String.Format("{0:yyyy-MM}-01", dt));
|
||||
|
||||
return DAOFactory.AdoDAO.ExecuteQuery(newsql).Tables[0];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
257
ReportImp/AKGG/Export/ExactExporter.cs
Normal file
257
ReportImp/AKGG/Export/ExactExporter.cs
Normal file
@@ -0,0 +1,257 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
|
||||
namespace Akgg.Export
|
||||
{
|
||||
public class ExactExporter
|
||||
{
|
||||
|
||||
public static QueryDC CreateQuery(QueryDC query)
|
||||
{
|
||||
DateTime dt = DateTime.Now;
|
||||
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
|
||||
|
||||
query.FileName = String.Format("Exact Export {0:yyyyMM}.csv", dt);
|
||||
query.QueryResult = GetAbrechnungenString(dt);
|
||||
return query;
|
||||
}
|
||||
|
||||
public static String GetAbrechnungenString(DateTime date)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
//sb.AppendLine("Betrag;Konto;Gegenkonto;Belegdatum;Rechnungsnummer;Buchungstext;Kostenstelle");
|
||||
|
||||
//sb.AppendLine("Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle");
|
||||
sb.AppendLine("regelnumber, fakt_code, debnr, refer, refer1, refer2, refer3, ordernr, orddat, magcode, ex_artcode, verteg, kstplcode, selcode, inv_in_vv, " +
|
||||
"nettoprijs, valcode, koers, betcond, levwijze, vrachtkost, orderkost, fakt_kort, tot_bdr, colli, bruto_gew, netto_gew, afldat, adr_code, -, " +
|
||||
"bruto / netto, -, -, -, -, -, -, -, -, -, -, fak_soort, ord_fakt, deb_id, fiattering, fakdebnr, -, faknr, kstplcode");
|
||||
sb.AppendLine("regelnumber,-,-,-,-,-,-,-,-,magcode,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,afldat,afl_week,artcode,ar_soort,oms45,aantal," +
|
||||
"btw_code,prijslijst,korting,prijs,prijs_n,kstdrcode,text,reknr,-,-,-,-,-,kstplcode,-,kstplcode");
|
||||
|
||||
// 0; 111; 281001; ; ; ; ; ; ; ; ; ; ; ; ; ; EUR; 1; ; ; ; ; ; 130.00; ; ; ; 20220531; ; ; ; Hans Werner 05 / 15; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ;
|
||||
// 1; 111; 281001; ; ; ; ; ; ; ; ; ; ; ; ; ; EUR; 1; ; ; ; ; ; +76.00; ; ; ; 20220531; ; ; ; Hans Werner 05 / 15; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ;
|
||||
|
||||
|
||||
var s = GetMonatlicheRechnungenString(date);
|
||||
if (!String.IsNullOrWhiteSpace(s))
|
||||
{
|
||||
sb.Append(s);
|
||||
}
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
public static String GetMonatlicheRechnungenString(DateTime date)
|
||||
{
|
||||
var sql = GetMonatlicheRechnungenSql(date);
|
||||
|
||||
/*
|
||||
sip.Claim,
|
||||
c.DebitorNumber,
|
||||
ib.InvoiceDate,
|
||||
ib.invoicenumber,
|
||||
ib.Oid AS InvoiceBaseOid,
|
||||
c.CostCenter,
|
||||
c2s.Oid,
|
||||
ib.InvoiceId,
|
||||
org.DebitorNumber
|
||||
*/
|
||||
// 0, 111, 281001, , , , , , , , , , , , , , EUR, 1, , , , , , 130.00, , , , 20220531, , , , Hans Werner 05 / 15, , , , , , , , , , , , , , , , ,
|
||||
// 1, 111, 281001, , , , , , , , , , , , , , EUR, 1, , , , , , +76.00, , , , 20220531, , , , Hans Werner 05 / 15, , , , , , , , , , , , , , , , ,
|
||||
//"Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle"
|
||||
|
||||
var dt = ExecuteQuery(sql, date, null);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
foreach (DataRow row in dt.Rows)
|
||||
{
|
||||
//DateTime lastDate = new DateTime(date.Year, date.Month, 1);
|
||||
//lastDate = lastDate.AddMonths(1).AddDays(-1);
|
||||
|
||||
//sb.Append(String.Format("{0:ddMM}", lastDate));
|
||||
sb.Append("0,111,");
|
||||
sb.Append(String.Format("{0}", row[1])); //Debitornr.
|
||||
sb.Append(", , , , , , , , , , , , , , EUR, 1, , , , , , ");
|
||||
sb.Append(String.Format("{0:c2}", row[0]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0:yyyyMMdd}", row[4]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0} {1} {2:MM} / {2:yyyy}", row[2], row[3], row[4]));
|
||||
sb.Append(", , , , , , , , , , , , , , , ,Test");
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
sb.AppendLine();
|
||||
}
|
||||
|
||||
string ibOid = String.Format("{0}", row[6]);
|
||||
string sipOid = String.Format("{0}", row[7]);
|
||||
|
||||
if (!String.IsNullOrWhiteSpace(ibOid))
|
||||
{
|
||||
sql = GetInvoiceItems();
|
||||
var sdt = ExecuteQuery(sql, date, ibOid);
|
||||
if (sdt.Rows.Count != 0)
|
||||
{
|
||||
foreach (DataRow srow in sdt.Rows)
|
||||
{
|
||||
sb.Append("0,111,");
|
||||
sb.Append(String.Format("{0}", row[1])); //Debitornr.
|
||||
sb.Append(", , , , , , , , , , , , , , EUR, 1, , , , , , ");
|
||||
sb.Append(String.Format("{0:c2}", srow[2]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0:yyyyMMdd}", row[4]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0} {1} {2:MM} / {2:yyyy},", row[2], row[3], row[4]));
|
||||
sb.Append(String.Format("{0:0.00}", srow[0]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0:c2}", srow[2]));
|
||||
sb.Append(", , , , , , , , , , , ,Test");
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
sb.AppendLine();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!String.IsNullOrWhiteSpace(sipOid))
|
||||
{
|
||||
sql = GetInvoiceItemsSIP();
|
||||
sdt = ExecuteQuery(sql, date, sipOid);
|
||||
if (sdt.Rows.Count != 0)
|
||||
{
|
||||
foreach (DataRow srow in sdt.Rows)
|
||||
{
|
||||
if (!srow[0].ToString().StartsWith("0,00"))
|
||||
{
|
||||
sb.Append("0,111,");
|
||||
sb.Append(String.Format("{0}", row[1])); //Debitornr.
|
||||
sb.Append(", , , , , , , , , , , , , , EUR, 1, , , , , , ");
|
||||
sb.Append(String.Format("{0:c2}", srow[3]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0:yyyyMMdd}", row[4]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0} {1} {2:MM} / {2:yyyy},", row[2], row[3], row[4]));
|
||||
sb.Append(String.Format("{0:0.00}", srow[0]));
|
||||
sb.Append(", , , ,");
|
||||
sb.Append(String.Format("{0:c2}", srow[3]));
|
||||
sb.Append(", , , , , , , , , , , ,Test");
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
sb.AppendLine();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static Dictionary<long, decimal> CreateHourlyRateDict(List<long> catOids, DateTime date)
|
||||
{
|
||||
Dictionary<long, decimal> dict = new Dictionary<long, decimal>();
|
||||
|
||||
foreach (var oid in catOids)
|
||||
{
|
||||
var cat = DAOFactory.GenericDAO.LoadByID<ServiceCategory>(oid);
|
||||
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
|
||||
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, date);
|
||||
if (cp != null && cp.CostRateValue.HasValue)
|
||||
dict.Add(oid, cp.CostRateValue.Value);
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
|
||||
private static String GetMonatlicheRechnungenSql(DateTime date)
|
||||
{
|
||||
String sql = @"
|
||||
select
|
||||
sip.Claim,
|
||||
c.DebitorNumber,
|
||||
p.FirstName,
|
||||
p.LastName,
|
||||
ib.InvoiceDate,
|
||||
ib.invoicenumber,
|
||||
ib.Oid AS InvoiceBaseOid,
|
||||
sip.Oid AS sipOID,
|
||||
c.CostCenter,
|
||||
c2s.Oid,
|
||||
ib.InvoiceId,
|
||||
org.DebitorNumber
|
||||
from
|
||||
person p
|
||||
inner join customer c on c.personoid = p.oid
|
||||
inner join supportconcept sc on sc.customeroid = c.oid
|
||||
inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
|
||||
inner join costbearer cb on c2s.costbeareroid = cb.oid
|
||||
inner join organisation org on org.costbeareroid = cb.oid
|
||||
inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
|
||||
inner join serviceinvoice si on si.invoicebaseoid = ib.oid
|
||||
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
|
||||
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
|
||||
order by ib.invoicenumber
|
||||
";
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
private static String GetInvoiceItems()
|
||||
{
|
||||
String sql = @"
|
||||
SELECT
|
||||
UnitCount,
|
||||
AmountPerUnit,
|
||||
AmountTotal
|
||||
FROM
|
||||
invoiceitem
|
||||
WHERE invoicebaseoid = ':ibOid'
|
||||
";
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
private static String GetInvoiceItemsSIP()
|
||||
{
|
||||
String sql = @"
|
||||
SELECT
|
||||
UnitCount,
|
||||
AmountPerUnit,
|
||||
AmountTotal
|
||||
FROM
|
||||
invoiceitem
|
||||
WHERE serviceinvoiceperiodoid = ':ibOid'
|
||||
";
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
public static DataTable ExecuteQuery(String sql, DateTime dt, String ibOid)
|
||||
{
|
||||
var newsql = sql;
|
||||
newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:dd.MM.yyyy}", dt));
|
||||
newsql = newsql.Replace(":Belegnr", String.Format("{0:yyMM}", dt));
|
||||
newsql = newsql.Replace(":Monat_MM", String.Format("{0:MM}", dt));
|
||||
newsql = newsql.Replace(":Monat_Start", String.Format("{0:yyyy-MM}-01", dt));
|
||||
dt = dt.AddMonths(1);
|
||||
newsql = newsql.Replace(":Monat_End", String.Format("{0:yyyy-MM}-01", dt));
|
||||
newsql = newsql.Replace(":ibOid", ibOid);
|
||||
|
||||
return DAOFactory.AdoDAO.ExecuteQuery(newsql).Tables[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
145
ReportImp/BeWoDellbrueck/Quittierungsbeleg.Designer.cs
generated
145
ReportImp/BeWoDellbrueck/Quittierungsbeleg.Designer.cs
generated
@@ -48,16 +48,16 @@ namespace BeWoDellbrueck
|
||||
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.lblFLSMin = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
|
||||
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
|
||||
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
@@ -102,16 +102,17 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.lblFLS = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
|
||||
this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
|
||||
//
|
||||
// Detail
|
||||
@@ -154,7 +155,7 @@ namespace BeWoDellbrueck
|
||||
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
this.xrTableRow6});
|
||||
this.xrTable3.SizeF = new System.Drawing.SizeF(520F, 20F);
|
||||
this.xrTable3.SizeF = new System.Drawing.SizeF(537.7084F, 20F);
|
||||
this.xrTable3.StylePriority.UseFont = false;
|
||||
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
|
||||
//
|
||||
@@ -250,13 +251,13 @@ namespace BeWoDellbrueck
|
||||
this.xrTableCell12.StylePriority.UsePadding = false;
|
||||
this.xrTableCell12.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
this.xrTableCell12.Weight = 0.15151515111196878D;
|
||||
this.xrTableCell12.Weight = 0.17387428677455385D;
|
||||
//
|
||||
// GroupHeader1
|
||||
//
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableServiceRecords1});
|
||||
this.GroupHeader1.HeightF = 70F;
|
||||
this.GroupHeader1.HeightF = 60F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.RepeatEveryPage = true;
|
||||
//
|
||||
@@ -270,7 +271,7 @@ namespace BeWoDellbrueck
|
||||
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
|
||||
this.xrTableRow2,
|
||||
this.xrTableRow1});
|
||||
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(520F, 60F);
|
||||
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(537.7084F, 60F);
|
||||
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
|
||||
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
|
||||
this.xrTableServiceRecords1.StylePriority.UseFont = false;
|
||||
@@ -282,7 +283,7 @@ namespace BeWoDellbrueck
|
||||
this.xrTableCell3,
|
||||
this.xrTableCell4,
|
||||
this.xrTableCell11,
|
||||
this.xrTableCell9});
|
||||
this.lblFLSMin});
|
||||
this.xrTableRow2.Name = "xrTableRow2";
|
||||
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
|
||||
@@ -334,21 +335,21 @@ namespace BeWoDellbrueck
|
||||
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell11.Weight = 0.33519553072625707D;
|
||||
//
|
||||
// xrTableCell9
|
||||
// lblFLSMin
|
||||
//
|
||||
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
this.lblFLSMin.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell9.Multiline = true;
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrTableCell9.StylePriority.UseBorders = false;
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
this.xrTableCell9.StylePriority.UsePadding = false;
|
||||
this.xrTableCell9.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell9.Text = "FLS in Minuten";
|
||||
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.xrTableCell9.Weight = 0.33519553072625685D;
|
||||
this.lblFLSMin.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblFLSMin.Multiline = true;
|
||||
this.lblFLSMin.Name = "lblFLSMin";
|
||||
this.lblFLSMin.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.lblFLSMin.StylePriority.UseBorders = false;
|
||||
this.lblFLSMin.StylePriority.UseFont = false;
|
||||
this.lblFLSMin.StylePriority.UsePadding = false;
|
||||
this.lblFLSMin.StylePriority.UseTextAlignment = false;
|
||||
this.lblFLSMin.Text = "FLS in Minuten";
|
||||
this.lblFLSMin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
|
||||
this.lblFLSMin.Weight = 0.38466026263530018D;
|
||||
//
|
||||
// xrTableRow1
|
||||
//
|
||||
@@ -425,11 +426,7 @@ namespace BeWoDellbrueck
|
||||
this.xrTableCell7.StylePriority.UseTextAlignment = false;
|
||||
this.xrTableCell7.Text = "-\r\n(ohne 1,2)";
|
||||
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
|
||||
this.xrTableCell7.Weight = 0.3351955307262568D;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
this.xrTableCell7.Weight = 0.38466026263530007D;
|
||||
//
|
||||
// formattingRuleStartDate
|
||||
//
|
||||
@@ -441,6 +438,7 @@ namespace BeWoDellbrueck
|
||||
// ReportHeader
|
||||
//
|
||||
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.lblKategorie,
|
||||
this.xrPictureBox1,
|
||||
this.xrLabel7,
|
||||
this.xrLabel8,
|
||||
@@ -449,16 +447,24 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel4,
|
||||
this.xrLabel3,
|
||||
this.xrLabel2});
|
||||
this.ReportHeader.HeightF = 175.8333F;
|
||||
this.ReportHeader.HeightF = 197.7083F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
//
|
||||
// xrPictureBox1
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.58333F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(157.6248F, 137.125F);
|
||||
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
|
||||
//
|
||||
// xrLabel7
|
||||
//
|
||||
this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(200F, 129.6944F);
|
||||
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(200F, 151.5694F);
|
||||
this.xrLabel7.Name = "xrLabel7";
|
||||
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel7.SizeF = new System.Drawing.SizeF(122.4996F, 30.50002F);
|
||||
@@ -475,10 +481,10 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(336.2361F, 129.6944F);
|
||||
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(322.4997F, 151.5694F);
|
||||
this.xrLabel8.Name = "xrLabel8";
|
||||
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel8.SizeF = new System.Drawing.SizeF(183.7641F, 30.50002F);
|
||||
this.xrLabel8.SizeF = new System.Drawing.SizeF(215.2088F, 30.50002F);
|
||||
this.xrLabel8.StylePriority.UseBackColor = false;
|
||||
this.xrLabel8.StylePriority.UseBorders = false;
|
||||
this.xrLabel8.StylePriority.UseFont = false;
|
||||
@@ -492,10 +498,10 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(336.2361F, 77.6111F);
|
||||
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(322.4996F, 99.4861F);
|
||||
this.xrLabel6.Name = "xrLabel6";
|
||||
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel6.SizeF = new System.Drawing.SizeF(183.7643F, 30.50001F);
|
||||
this.xrLabel6.SizeF = new System.Drawing.SizeF(215.2088F, 30.50002F);
|
||||
this.xrLabel6.StylePriority.UseBackColor = false;
|
||||
this.xrLabel6.StylePriority.UseBorders = false;
|
||||
this.xrLabel6.StylePriority.UseFont = false;
|
||||
@@ -508,10 +514,10 @@ namespace BeWoDellbrueck
|
||||
//
|
||||
this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(336.2361F, 47.1111F);
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(322.4997F, 68.9861F);
|
||||
this.xrLabel5.Name = "xrLabel5";
|
||||
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel5.SizeF = new System.Drawing.SizeF(183.7641F, 30.50001F);
|
||||
this.xrLabel5.SizeF = new System.Drawing.SizeF(215.2089F, 30.50001F);
|
||||
this.xrLabel5.StylePriority.UseBackColor = false;
|
||||
this.xrLabel5.StylePriority.UseBorders = false;
|
||||
this.xrLabel5.StylePriority.UseFont = false;
|
||||
@@ -526,7 +532,7 @@ namespace BeWoDellbrueck
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(200F, 77.6111F);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(200F, 99.4861F);
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel4.SizeF = new System.Drawing.SizeF(122.4996F, 30.50001F);
|
||||
@@ -543,7 +549,7 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(200F, 47.1111F);
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(200F, 68.9861F);
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel3.SizeF = new System.Drawing.SizeF(122.4996F, 30.50001F);
|
||||
@@ -562,7 +568,7 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel2.Multiline = true;
|
||||
this.xrLabel2.Name = "xrLabel2";
|
||||
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel2.SizeF = new System.Drawing.SizeF(306.2637F, 32.29167F);
|
||||
this.xrLabel2.SizeF = new System.Drawing.SizeF(337.7085F, 32.29167F);
|
||||
this.xrLabel2.StylePriority.UseFont = false;
|
||||
this.xrLabel2.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel2.Text = "Quittierungsbeleg";
|
||||
@@ -613,7 +619,7 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel13,
|
||||
this.xrLabel12,
|
||||
this.xrLabel11,
|
||||
this.xrLabel9,
|
||||
this.lblFLS,
|
||||
this.xrLabel1});
|
||||
this.GroupFooter1.HeightF = 270F;
|
||||
this.GroupFooter1.KeepTogether = true;
|
||||
@@ -966,7 +972,7 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
|
||||
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200.0005F, 20.00001F);
|
||||
this.xrLabel11.Name = "xrLabel11";
|
||||
this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F);
|
||||
this.xrLabel11.SizeF = new System.Drawing.SizeF(337.7079F, 20F);
|
||||
this.xrLabel11.StylePriority.UseBackColor = false;
|
||||
this.xrLabel11.StylePriority.UseBorders = false;
|
||||
this.xrLabel11.StylePriority.UseFont = false;
|
||||
@@ -975,21 +981,21 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
|
||||
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// xrLabel9
|
||||
// lblFLS
|
||||
//
|
||||
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
this.lblFLS.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
|
||||
this.xrLabel9.Name = "xrLabel9";
|
||||
this.xrLabel9.SizeF = new System.Drawing.SizeF(200F, 20F);
|
||||
this.xrLabel9.StylePriority.UseBackColor = false;
|
||||
this.xrLabel9.StylePriority.UseBorders = false;
|
||||
this.xrLabel9.StylePriority.UseFont = false;
|
||||
this.xrLabel9.StylePriority.UsePadding = false;
|
||||
this.xrLabel9.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel9.Text = "Fachleistungen in Minuten";
|
||||
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
this.lblFLS.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.lblFLS.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
|
||||
this.lblFLS.Name = "lblFLS";
|
||||
this.lblFLS.SizeF = new System.Drawing.SizeF(200F, 20F);
|
||||
this.lblFLS.StylePriority.UseBackColor = false;
|
||||
this.lblFLS.StylePriority.UseBorders = false;
|
||||
this.lblFLS.StylePriority.UseFont = false;
|
||||
this.lblFLS.StylePriority.UsePadding = false;
|
||||
this.lblFLS.StylePriority.UseTextAlignment = false;
|
||||
this.lblFLS.Text = "Fachleistungen in Minuten";
|
||||
this.lblFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
@@ -1000,7 +1006,7 @@ namespace BeWoDellbrueck
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(400F, 0F);
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(120.0002F, 20F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(137.7084F, 20F);
|
||||
this.xrLabel1.StylePriority.UseBackColor = false;
|
||||
this.xrLabel1.StylePriority.UseBorders = false;
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
@@ -1015,13 +1021,23 @@ namespace BeWoDellbrueck
|
||||
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
|
||||
this.fieldKontaktArt.Name = "fieldKontaktArt";
|
||||
//
|
||||
// xrPictureBox1
|
||||
// lblKategorie
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.70833F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(157.6248F, 137.125F);
|
||||
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
|
||||
this.lblKategorie.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
|
||||
this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(200F, 32.29167F);
|
||||
this.lblKategorie.Multiline = true;
|
||||
this.lblKategorie.Name = "lblKategorie";
|
||||
this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.lblKategorie.SizeF = new System.Drawing.SizeF(337.7084F, 32.29168F);
|
||||
this.lblKategorie.StylePriority.UseFont = false;
|
||||
this.lblKategorie.StylePriority.UseTextAlignment = false;
|
||||
this.lblKategorie.Text = "Assistenzleistungen";
|
||||
this.lblKategorie.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
|
||||
this.lblKategorie.Visible = false;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// Quittierungsbeleg
|
||||
//
|
||||
@@ -1048,10 +1064,10 @@ namespace BeWoDellbrueck
|
||||
this.Version = "17.1";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
|
||||
|
||||
}
|
||||
@@ -1076,7 +1092,7 @@ namespace BeWoDellbrueck
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
|
||||
private DevExpress.XtraReports.UI.XRTableCell lblFLSMin;
|
||||
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
|
||||
@@ -1100,7 +1116,7 @@ namespace BeWoDellbrueck
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
|
||||
private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblFLS;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
|
||||
@@ -1133,5 +1149,6 @@ namespace BeWoDellbrueck
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
|
||||
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblKategorie;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +47,15 @@ namespace BeWoDellbrueck
|
||||
}
|
||||
|
||||
ErstelleAbwesenheitenTabelle(pRO);
|
||||
// Die haben für FLS, Assistenz und Fachassistenz 3 verschiedene Organisationen - für die einfacher
|
||||
if (pRO.Costbearer.ToLower().Contains("assistenz"))
|
||||
{
|
||||
lblKategorie.Visible = true;
|
||||
lblFLS.Text = "Assistenzleistungen in Minuten";
|
||||
lblFLSMin.Text = "Assistenz in Minuten";
|
||||
if (pRO.Costbearer.ToLower().Contains("fachassistenz"))
|
||||
lblKategorie.Text = "Fachassistenz";
|
||||
}
|
||||
|
||||
bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
@@ -207,6 +207,8 @@ namespace DiakonischesWerkHerne
|
||||
//
|
||||
// xrTableCell15
|
||||
//
|
||||
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
|
||||
this.xrTableCell15.Font = new System.Drawing.Font("Calibri", 10F);
|
||||
this.xrTableCell15.Name = "xrTableCell15";
|
||||
this.xrTableCell15.StylePriority.UseBorders = false;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -30,7 +30,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "0216265667"; // LH Hannover
|
||||
//t = "1774789565"; // LH Essen
|
||||
//t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft
|
||||
//t = "1193188501"; // Aids Hilfe Dortmund
|
||||
t = "1193188501"; // Aids Hilfe Dortmund
|
||||
//t = "7860351957"; // SKF Alsdorf
|
||||
//t = "3311520228"; // Die Düne
|
||||
//t = "1352143437"; // Sewo
|
||||
@@ -70,14 +70,13 @@ namespace BeWo.Service.Plugins
|
||||
//t = "5157599087"; // SHG Schwerte
|
||||
//t = "4526293996"; // Fortis
|
||||
//t = "3647969417"; // Caritas Bottrop
|
||||
//t = "3963982016"; // Convoi
|
||||
//t = "3057313346"; // SSB Mainz
|
||||
//t = "6246287823"; // BeWo Alsdorf
|
||||
//t = "1420341656"; // Vibb Essen
|
||||
//t = "4941141927"; // Signcom
|
||||
//t = "8897605322"; // SPZ Ratingen
|
||||
//t = "6483870127"; // Wigonetz
|
||||
t = "9482484652"; // Blömeling und Teckhaus
|
||||
//t = "9482484652"; // Blömeling und Teckhaus
|
||||
//t = "8001550599"; // Biallas BeWo
|
||||
//t = "7282396774"; // Caritas Unna
|
||||
//t = "6884855402"; // IBP
|
||||
@@ -171,8 +170,6 @@ namespace BeWo.Service.Plugins
|
||||
//t = "8275654834"; // Twg Jonathan
|
||||
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
|
||||
//t = "2632162696"; // Hand in Hand (ehemals Pro BeWo Düren)
|
||||
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
|
||||
//t = "2632162696"; // Pro BeWo Düren
|
||||
//t = "6340891020"; // Caritas Ahlen
|
||||
//t = "3659854106"; // alpha e.V.
|
||||
//t = "5809130435"; // Lebenshilfe Kusel
|
||||
@@ -211,7 +208,6 @@ namespace BeWo.Service.Plugins
|
||||
//t = "7185105541"; // Nous GmbH
|
||||
//t = "5022131330"; // Tabula Rasa
|
||||
//t = "4189934785"; // Landshuter Netzwerke
|
||||
//t = "4290816992"; // BeWo Imflow
|
||||
//t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR
|
||||
//t = "3678599942"; // VKM Rietberg
|
||||
//t = "4069072369"; // BeWo Dreilich&Pastor (Pastor)
|
||||
@@ -272,7 +268,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "8242644560"; // Bewolonia - Fr. Sultan Schulz
|
||||
//t = "4817284046"; // Verein für Sozialmedizin Stade e.V.
|
||||
//t = "6323001211"; // ASB Faßbacher Hof gGmbH
|
||||
t = "9389386079"; // VARO Sozialagentur
|
||||
//t = "9389386079"; // VARO Sozialagentur
|
||||
//t = "7951718431"; // Ambulant Betreutes Wohnen Astrid Pulm
|
||||
//t = "5850903700"; // Alzey Teilhabe
|
||||
//t = "5929601293"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz)
|
||||
@@ -299,12 +295,11 @@ namespace BeWo.Service.Plugins
|
||||
//t = "5478434972"; // LebensWert - Kai Lippel
|
||||
//t = "5381886394"; // PZDDuesseldorf
|
||||
//t = "3640152169"; // Claudia Charisius
|
||||
//t = "3884496709"; // Wahl e.V.
|
||||
//t = "3536079480"; // Behindertenhilfe Menden
|
||||
//t = "5427523619"; // Christopherus-Haus Familienhilfe
|
||||
//t = "8251343124"; // Rat Plus Tat
|
||||
//t = "6819347851"; // Awo Kreisverband Plön
|
||||
//t = "2385915144"; // AKGG GmbHd
|
||||
t = "2385915144"; // AKGG GmbHd
|
||||
//t = "8002913382"; // AKGG GmbH (MID)
|
||||
//t = "5155880294"; // BHV Bergische Hauspflege
|
||||
//t = "8366649557"; // Münchner Aids-Hilfe e.V.
|
||||
@@ -330,7 +325,8 @@ namespace BeWo.Service.Plugins
|
||||
//t = "9094672461"; // Transkulturelles Betreuungsbüro (Toprak GmbH)
|
||||
//t = "9008813932"; // Aids Hilfe Giessen
|
||||
//t = "4052216789"; // Perspektiven e.V.
|
||||
t = "7663765314"; // Chrstina Frommen (Frommen BeWo)
|
||||
//t = "7663765314"; // Chrstina Frommen (Frommen BeWo)
|
||||
//t = "5462295916"; // BeWo Dellbrueck
|
||||
|
||||
|
||||
return t;
|
||||
|
||||
Reference in New Issue
Block a user