This commit is contained in:
Christian
2022-02-22 11:58:42 +01:00
parent d97c1e45f7
commit 8184426879
50 changed files with 1553 additions and 595 deletions

View File

@@ -48,8 +48,8 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
public static string ShortVersion = "3.6";
public static string Version = "Version 3.6";
public static string ShortVersion = "3.7";
public static string Version = "Version 3.7";
public static int RenderTier = 0;

View File

@@ -246,7 +246,7 @@
</Button.RenderTransform>
</localView:ImageButton>
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View, BargeldverwaltungFinanzenAnsehen, DokumenteFinanzen"
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_AccountingTransacation"
Click="button_AccountingTransacation_Click" Style="{StaticResource NavBarButton}"
Content="{t:Translate FinanzenMenuItem}" Background="{StaticResource AccountingContentBrush}"

View File

@@ -9,6 +9,7 @@
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
mc:Ignorable="d" VerticalAlignment="Stretch" Focusable="True">
<view:BeWoView.Resources>
@@ -110,6 +111,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}} -->
<!--<Label Grid.Column="0" Grid.Row="0" Content="Kasse" VerticalAlignment="Center" />
@@ -128,16 +130,19 @@
<Label Grid.Column="0" Grid.Row="2" Content="Betrag" VerticalAlignment="Center" />
<dxe:TextEdit Grid.Column="1" Grid.Row="2" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height="23" Margin="3" x:Name="NewTransaktionBetragTextEdit"
EditValue="{validation:ValidationBinding Path=NewBargeldtransaktion.Betrag, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<Label Grid.Column="0" Grid.Row="3" Content="{t:Translate Belegnummer}" VerticalAlignment="Center" />
<dxe:TextEdit Grid.Column="1" Grid.Row="3" Height="23" Margin="3" x:Name="NewTransaktionBelegnummerTextEdit"
EditValue="{validation:ValidationBinding Path=NewBargeldtransaktion.Belegnummer, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<Label Grid.Column="0" Grid.Row="3" Content="Notiz" VerticalAlignment="Center" />
<TextBox Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Height="60" Margin="3,0,3,3"
<Label Grid.Column="0" Grid.Row="4" Content="Notiz" VerticalAlignment="Center" />
<TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Height="60" Margin="3,0,3,3"
ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True"
AutoWordSelection="True" Language="de-DE" SpellCheck.IsEnabled="True"
x:Name="NewTransaktionNotizTextBox"
Text="{Binding Path=NewBargeldtransaktion.Notice, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"/>
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right">
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Click="ButtonAddBargeldtransaktionClick" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Right" />
<Button HorizontalAlignment="Right" VerticalAlignment="Center" Height="25"
@@ -285,6 +290,11 @@
<dxe:TextEditSettings MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="{t:Translate Belegnummer}" FixedWidth="True" FieldName="Belegnummer" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Angelegt von" FixedWidth="True" FieldName="InsUser" AllowEditing="False">
</dxg:GridColumn>

View File

@@ -217,6 +217,7 @@ namespace BeWo.View
{
isRelevantProperty = args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Betrag) ||
args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Notice) ||
args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Belegnummer) ||
args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Zahlungsdatum) ||
args.PropertyDescriptor.Name.Equals(BargeldtransaktionsVM.PropertyName_Zahlungstyp);
}

View File

@@ -368,7 +368,7 @@
<Label Grid.Column="0" Grid.Row="3" Content="Geburtstag" />
<dxe:DateEdit AllowNullInput="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" MinWidth="30"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" MinWidth="90"
HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
<Label Grid.Column="2" Grid.Row="0" Content="Familienstand" />

View File

@@ -589,6 +589,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<GroupBox Visibility="Collapsed" x:Name="groupbox_newCustomerRel" Header="{markup:Translate Klient zuordnen}" Style="{StaticResource ObjectEditGroupBox}">
@@ -613,6 +614,13 @@
</Grid>
</GroupBox>
<GroupBox x:Name="GroupBoxCustomers" Header="{markup:Translate Diesem Mitarbeiter zugeordnete Klienten}" Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0"></GroupBox>
<StackPanel Grid.Row="2" Orientation="Horizontal" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Right">
<TextBlock x:Name="textblock_link_pdfexport" Margin="5,0,5,3" FontSize="14">
<Hyperlink x:Name="linkPdfExport" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkPdfExport_OnRequestNavigate">
<Run Text="Drucken" />
</Hyperlink>
</TextBlock>
</StackPanel>
</Grid>
</TabItem>
<TabItem Header="Abwesenheiten">

View File

@@ -9,6 +9,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using BeWo.Annotations;
using BeWo.Core;
using BeWo.Core.Service;
@@ -23,6 +24,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;
@@ -181,7 +183,7 @@ namespace BeWo.View.Detail
{
_ViewModel = value;
DataContext = value;
UpdateReportUrl();
OnPropertyChanged(nameof(ViewModel));
if (tabcontrol_contracts.Items.Count == 0 && _ViewModel.Contracts.VMList.Count > 0)
@@ -724,6 +726,19 @@ namespace BeWo.View.Detail
LeaveDaysTabItem.Content = new UrlaubskontoView(ViewModel.DataContract);
}
private void UpdateReportUrl()
{
var url = BeWoWpfUtils.GetHTMLEncodedURL(string.Format("{0}/ReportView.aspx?eOid={1}&type={2}", BeWoApp.SiteOfOrigin, ViewModel.DataContract.EmployeeOid ?? 0, Utils.EnumName(ReportTypes.MitarbeiterKlientenReport)));
linkPdfExport.NavigateUri = new Uri(url);
}
private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Zugeordnete Klient:innen"));
}
#region Nur relevant, wenn Urlaubskonto keine eigene View mehr ist
/*
private void InitDateComboBox()

View File

@@ -87,6 +87,20 @@ namespace BeWo.View.Master
private void InitRights()
{
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.AccountingTransactionView_View))
{
tabitem_financeBooking.Visibility = Visibility.Collapsed;
tabitem_financeOverview.Visibility = Visibility.Collapsed;
tabitem_openClaims.Visibility = Visibility.Collapsed;
tabitem_settlementinvoice.Visibility = Visibility.Collapsed;
tabitem_equityinvoice.Visibility = Visibility.Collapsed;
tabitem_collectiveinvoice.Visibility = Visibility.Collapsed;
tabitem_otherinvoice.Visibility = Visibility.Collapsed;
tabitem_overviewinvoice.Visibility = Visibility.Collapsed;
tabitem_bargeldverwaltung.Visibility = Visibility.Collapsed;
tabitem_documents.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_Settlement_View))
{
tabitem_settlementinvoice.Visibility = Visibility.Collapsed;
@@ -102,15 +116,32 @@ namespace BeWo.View.Master
tabitem_settlementinvoice.Visibility = Visibility.Visible;
}
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DokumenteFinanzen))
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.DokumenteFinanzen))
{
tabitem_documents.Visibility = Visibility.Visible;
}
else
{
tabitem_documents.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BargeldverwaltungFinanzenAnsehen))
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.BargeldverwaltungFinanzenAnsehen))
{
tabitem_bargeldverwaltung.Visibility = Visibility.Visible;
}
else
{
tabitem_bargeldverwaltung.Visibility = Visibility.Collapsed;
}
foreach (TabItem tabitem in root.Items)
{
if (tabitem.Visibility == Visibility.Visible)
{
tabitem.IsSelected = true;
break;
}
}
}
private void tabitem_equityinvoice_Selected(object sender, RoutedEventArgs e)

View File

@@ -145,7 +145,7 @@ namespace BeWo.View.Master
this.tabitem_serviceOverview.Visibility = Visibility.Collapsed;
}
if(!BeWoApp.AppSettings.ShowDistanceFields || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View))
if(!BeWoApp.AppSettings.ShowDistanceFields || (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.KilometerauswertungEigene_View)))
{
TabItemKilometerauswertung.Visibility = Visibility.Collapsed;
}

View File

@@ -9,6 +9,7 @@ using System.Windows;
using System.Windows.Controls;
using BeWo.Annotations;
using BeWo.ServiceProxy;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using ChatController.Utilities.Extensions;
@@ -171,6 +172,15 @@ namespace BeWo.View.Report.Kilometerauswertung
// DevExpress
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
SelectedEmployee = BeWoApp.LoggedOnUser.Employee;
EmployeePopUpEdit.Text = BeWoApp.LoggedOnUser.Employee.SimpleDescription;
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View))
{
AllEmployeesCheckBox.IsEnabled = false;
EmployeePopUpEdit.IsEnabled = false;
}
Unloaded += delegate
{
@@ -304,7 +314,7 @@ namespace BeWo.View.Report.Kilometerauswertung
_ReportType = KilometerauslastungsType.Employee;
break;
}
OnPropertyChanged(nameof(IsCreateButtonEnabled));
SetVisibilityValues();
}
@@ -320,6 +330,14 @@ namespace BeWo.View.Report.Kilometerauswertung
private void EmployeeSearchViewPopup_EmployeeSelected(object sender, EventArgs<CompactEmployeeDC> e)
{
SelectedEmployee = e.Data;
if (SelectedEmployee != null)
{
EmployeePopUpEdit.Text = SelectedEmployee.SimpleDescription;
}
else
{
EmployeePopUpEdit.Text = "";
}
EmployeeSearchViewPopup.IsOpen = false;
}

View File

@@ -15,7 +15,8 @@ namespace BeWo.ViewModel
public static string PropertyName_Zahlungsdatum = "Zahlungsdatum";
public static string PropertyName_Betrag = "Betrag";
public static string PropertyName_Transaktionskassenbestand = "Transaktionskassenbestand";
public static string PropertyName_Notice = "Notice";
public static string PropertyName_Belegnummer = "Belegnummer";
public static string PropertyName_Notice = "Notice";
//private CompactCustomerDC _Customer;
@@ -23,26 +24,27 @@ namespace BeWo.ViewModel
private DateTime? _Zahlungsdatum;
private decimal? _Betrag;
private decimal? _Transaktionskassenbestand;
private string _Notice;
private string _Belegnummer;
private string _Notice;
//public CompactCustomerDC Customer
//{
// get { return _Customer; }
//public CompactCustomerDC Customer
//{
// get { return _Customer; }
// set
// {
// if (!AreDifferent(_Customer, value))
// {
// return;
// }
// set
// {
// if (!AreDifferent(_Customer, value))
// {
// return;
// }
// _Customer = value;
// StoreDirtyInformation(AreDifferent(DataContract.Customer, value), PropertyName_Customer);
// FirePropertyChanged(PropertyName_Customer);
// }
//}
// _Customer = value;
// StoreDirtyInformation(AreDifferent(DataContract.Customer, value), PropertyName_Customer);
// FirePropertyChanged(PropertyName_Customer);
// }
//}
public string Notice
public string Notice
{
get { return _Notice; }
@@ -57,6 +59,21 @@ namespace BeWo.ViewModel
}
}
public string Belegnummer
{
get { return _Belegnummer; }
set
{
if (AreDifferent(_Belegnummer, value))
{
_Belegnummer = value;
StoreDirtyInformation(AreDifferent(DataContract.Belegnummer, value), PropertyName_Belegnummer);
FirePropertyChanged(PropertyName_Belegnummer);
}
}
}
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public EnumValue<Zahlungstyp> Zahlungstyp
{
@@ -139,6 +156,7 @@ namespace BeWo.ViewModel
_Zahlungstyp = new EnumValue<Zahlungstyp>(pDataContract.Zahlungstyp, EnumTranslations.AllTranslations[pDataContract.Zahlungstyp]);
_Transaktionskassenbestand = pDataContract.Transaktionskassenbestand;
_Notice = pDataContract.Notice;
_Belegnummer = pDataContract.Belegnummer;
}
}
@@ -150,7 +168,7 @@ namespace BeWo.ViewModel
pDataContract.Zahlungstyp = _Zahlungstyp.Enum;
pDataContract.Transaktionskassenbestand = _Transaktionskassenbestand;
pDataContract.Notice = _Notice;
pDataContract.Belegnummer = _Belegnummer;
return pDataContract;
}
}

View File

@@ -9,8 +9,7 @@ namespace BeWo.Data.Entities
public static String PropertyName_Betrag = "Betrag";
//public static String PropertyName_Customer = "Customer";
public static String PropertyName_Zahlungsdatum = "Zahlungsdatum";
public static String PropertyName_Transaktionskassenbestand = "Transaktionskassenbestand";
@@ -99,5 +98,7 @@ namespace BeWo.Data.Entities
}
}
}
public virtual String Belegnummer { get; set; }
}
}

View File

@@ -12,7 +12,7 @@
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="Belegnummer" type="String" name="Belegnummer" />
<property column="Betrag" type="Decimal" name="Betrag" />
<property column="Transaktionskassenbestand" type="Decimal" name="Transaktionskassenbestand" />
<property column="Zahlungstyp" type="BS.Shared.Zahlungstyp, BS.Shared" name="Zahlungstyp" />

View File

@@ -165,6 +165,9 @@ namespace Host
case ReportTypes.AbwesenheitsPrintReport:
report = CreateAbwesenheitsPrintReport();
break;
case ReportTypes.MitarbeiterKlientenReport:
report = CreateEmployeeCustomerListReport();
break;
default:
report = CreateQueryReport();
break;
@@ -776,6 +779,18 @@ namespace Host
return reportCreator.CreateAbwesenheitsPrintReport(oidList, titel);
}
private XtraReport CreateEmployeeCustomerListReport()
{
long? oid = null;
if (Request.Params["eOid"] != null)
{
oid = long.Parse(Request.Params["eOid"]);
}
return reportCreator.CreateEmployeeCustomerListReport(oid);
}
private AbstractReportCreator GetReportCreator()
{
long? templateOid = null;

View File

@@ -13,7 +13,7 @@ CREATE TABLE `contracthistory` (
`ContractHistoryWeeklyFls` decimal(18,10) DEFAULT NULL,
`ContractHistoryWeeklyTotalhours` decimal(18,10) DEFAULT NULL,
`ContractHistoryLeaveDays` decimal(18,10) DEFAULT NULL,
`InsTs` datetime DEFAULT NULL,m
`InsTs` datetime DEFAULT NULL,
`InsUser` varchar(256) DEFAULT NULL,
`Version` bigint DEFAULT NULL,
`UpdTs` DATETIME NULL DEFAULT NULL,

View File

@@ -0,0 +1 @@
ALTER TABLE `Bargeldtransaktion` ADD COLUMN Belegnummer VARCHAR(128) NULL DEFAULT NULL;

View File

@@ -96,6 +96,10 @@ namespace BeWo.Report
public abstract XtraReport CreateVorlagenReport(long template, List<long> objectOids, long table);
public abstract XtraReport CreateAbwesenheitsPrintReport(List<long> oids, string titel);
public abstract XtraReport CreateEmployeeCustomerListReport(long? employeeOid);
}
}
}

View File

@@ -920,6 +920,15 @@ namespace BeWo.Report
return report as XtraReport;
}
public override XtraReport CreateEmployeeCustomerListReport(long? employeeOid)
{
var report = FindReportImp<EmployeeCustomerListRO>();
report.SetReportDataSource(EmployeeCustomerListRO.Create(employeeOid));
return report as XtraReport;
}
public override XtraReport CreateNotizenReport(long kategorieOid, DateTime start, DateTime end)
{
var report = FindReportImp<NotizenRO>();

View File

@@ -0,0 +1,335 @@
namespace BeWo.Report.DefaultReports
{
partial class EmployeeCustomerListReport
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail.HeightF = 25F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(700F, 25F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow1
//
this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9,
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell7});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.StylePriority.UseBorders = false;
this.xrTableRow1.Weight = 0.59999992675782143D;
//
// xrTableCell9
//
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Nachname";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell9.Weight = 0.69230768057016234D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Vorname";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.69230768057016223D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Rolle";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.69230769817645732D;
//
// xrTableCell7
//
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Notiz";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 1.1538461714524488D;
//
// TopMargin
//
this.TopMargin.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TopMargin.HeightF = 100F;
this.TopMargin.Name = "TopMargin";
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.StylePriority.UseFont = false;
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 37.33331F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "[Employee.FirstName] [Employee.LastName]";
//
// BottomMargin
//
this.BottomMargin.HeightF = 74F;
this.BottomMargin.Name = "BottomMargin";
this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.DetailReport.DataMember = "CustomerList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
//
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(700F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell10,
this.xrTableCell4,
this.xrTableCell5,
this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 3, 0, 100F);
this.xrTableRow2.StylePriority.UsePadding = false;
this.xrTableRow2.Weight = 1D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerList.Customer.LastName", "{0:dd.MM.yyyy}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.Weight = 0.69230768057016234D;
//
// xrTableCell4
//
this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerList.Customer.FirstName", "{0:c}")});
this.xrTableCell4.FormattingRules.Add(this.Einzahlungstextsichtbarkeitsformatierungsregel);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "xrTableCell4";
this.xrTableCell4.Weight = 0.69230768057016223D;
//
// Einzahlungstextsichtbarkeitsformatierungsregel
//
this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
//
// xrTableCell5
//
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerList.Rolle", "{0:c}")});
this.xrTableCell5.FormattingRules.Add(this.Auszahlungstextsichtbarkeitsformatierungsregel);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "xrTableCell5";
this.xrTableCell5.Weight = 0.69230769817645732D;
//
// Auszahlungstextsichtbarkeitsformatierungsregel
//
this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerList.Notiz")});
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Weight = 1.1538461714524493D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeCustomerListRO);
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.33332F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 25.66666F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Zugeordnete Klient:innen";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel2,
this.xrLabel1});
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
//
// EmployeeCustomerListReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.TopMargin,
this.BottomMargin,
this.DetailReport,
this.GroupHeader1});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.Einzahlungstextsichtbarkeitsformatierungsregel,
this.Auszahlungstextsichtbarkeitsformatierungsregel});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 74);
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private DevExpress.XtraReports.UI.TopMarginBand TopMargin;
private DevExpress.XtraReports.UI.BottomMarginBand BottomMargin;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.FormattingRule Einzahlungstextsichtbarkeitsformatierungsregel;
private DevExpress.XtraReports.UI.FormattingRule Auszahlungstextsichtbarkeitsformatierungsregel;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
}
}

View File

@@ -0,0 +1,23 @@
using System.Linq;
using BeWo.Report.ReportObjects;
namespace BeWo.Report.DefaultReports
{
public partial class EmployeeCustomerListReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<EmployeeCustomerListRO>
{
public EmployeeCustomerListReport()
{
InitializeComponent();
}
public void SetReportDataSource(EmployeeCustomerListRO pRO)
{
//if (pRO.Transaktionen != null)
//{
// pRO.Transaktionen = pRO.Transaktionen.OrderBy(o => o.Belegdatum).ToList();
//}
bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@@ -133,6 +133,12 @@
<Compile Include="DefaultReports\AbwesenheitsPrintReport.Designer.cs">
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\EmployeeCustomerListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\EmployeeCustomerListReport.Designer.cs">
<DependentUpon>EmployeeCustomerListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\RosterIstReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -410,6 +416,7 @@
<Compile Include="DefaultReportCreator.cs" />
<Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
<Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" />
<Compile Include="ReportObjects\EmployeeCustomerListRO.cs" />
<Compile Include="ReportObjects\FlsAuslastungsauswertungRO.cs" />
<Compile Include="ReportObjects\RosterIstRO.cs" />
<Compile Include="ReportObjects\RosterRO.cs" />
@@ -465,6 +472,10 @@
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\EmployeeCustomerListReport.resx">
<DependentUpon>EmployeeCustomerListReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\RosterIstReport.resx">
<DependentUpon>RosterIstReport.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Data.ICD10;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.Report.ReportObjects
{
public class EmployeeCustomerListRO : AbstractBeWoReportObject<EmployeeCustomerListRO>
{
public EmployeeDC Employee { get; set; }
public IList<Employee2CustomerDetail> CustomerList { get; set; }
public static EmployeeCustomerListRO Create(long? employeeOid)
{
var emp = DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid.Value);
var empDc = MapperFactory.EmployeeDC_Employee.MapToNewDC(emp);
var result = new EmployeeCustomerListRO();
result.Employee = empDc;
result.CustomerList = new List<Employee2CustomerDetail>();
foreach (var e2c in emp.Employee2CustomerList)
{
if (e2c.Customer.IsActive == ActivationTypeId.Active)
{
Employee2CustomerDetail e2cDetail = new Employee2CustomerDetail();
e2cDetail.Notiz = e2c.Notice;
foreach (var v2o in e2c.ValueList)
{
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType)
{
e2cDetail.Rolle = v2o.Entry.Value;
}
}
e2cDetail.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(e2c.Customer);
result.CustomerList.Add(e2cDetail);
}
}
//result.Notice = pDC.Notice;
result.CustomerList = result.CustomerList.OrderBy(c => c.Customer.LastNameFirstName).ToList();
return result;
}
}
public class Employee2CustomerDetail
{
public String Rolle { get; set; }
public String Notiz { get; set; }
public CompactCustomerDC Customer { get; set; }
}
}

View File

@@ -23,6 +23,8 @@ namespace BeWo.Report.ReportObjects
public MitarbeiterstundenkontoRO.EmployeeDetail AktuellBearbeitetesEmployeeDetail { get; set; }
public MitarbeiterstundenkontoBerechnung()
{
appSettings = AppSettings.CreateSettings();
@@ -135,25 +137,31 @@ namespace BeWo.Report.ReportObjects
decimal stundenSollGesamt = 0;
decimal tatSollStdGesamt = 0;
IList<ServiceRecord> recordsAll = DAOFactory.SearchDAO.FindServiceRecords(emp.Oid, null);
recordsAll = AnalysisServiceImp.FilterActiveServiceRecords(recordsAll);
IList<ServiceRecord> groupFilteredRecords = empDetail.AllServiceRecords;
//
IList<ServiceRecord> groupFilteredRecords = new List<ServiceRecord>();
Dictionary<long, bool> groupBookingDict = new Dictionary<long, bool>();
foreach (var item in recordsAll)
if (groupFilteredRecords == null)
{
IList<ServiceRecord> recordsAll = DAOFactory.SearchDAO.FindServiceRecords(emp.Oid, null);
recordsAll = AnalysisServiceImp.FilterActiveServiceRecords(recordsAll);
if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
//
groupFilteredRecords = new List<ServiceRecord>();
Dictionary<long, bool> groupBookingDict = new Dictionary<long, bool>();
foreach (var item in recordsAll)
{
groupFilteredRecords.Add(item);
if (item.GroupOid.HasValue)
if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
{
groupBookingDict.Add(item.GroupOid.Value, true);
groupFilteredRecords.Add(item);
if (item.GroupOid.HasValue)
{
groupBookingDict.Add(item.GroupOid.Value, true);
}
}
}
}
empDetail.AllServiceRecords = groupFilteredRecords;
}
while (berichtsAnfang < berichtsEnde)
{
StarteBerechnung(berichtsAnfang, berichtsEnde, empDetail);

View File

@@ -234,7 +234,9 @@ namespace BeWo.Report.ReportObjects
public IList<DayDetail> Days { get; set; }
public IList<ServiceRecord> ServiceRecordsInSelectedTimeSpan { get; set; }
public IList<ServiceRecord> AllServiceRecords { get; set; }
public IList<ServiceRecord> ServiceRecordsInSelectedTimeSpan { get; set; }
public Employee Employee { get; set; }
@@ -330,8 +332,8 @@ namespace BeWo.Report.ReportObjects
public String Regelarbeitszeit { get; set; }
public int ArbeitstageProWoche { get; set; }
public decimal ArbeitstageImBerichtszeitraum { get; set; }
public decimal ArbeitstageImBerichtszeitraum { get; set; }
public AbsenceTimeDays AbsenceTimeDays { get; set; }
public decimal? HourlyRate { get; set; }

View File

@@ -402,25 +402,27 @@ namespace AlphaEv
return sum;
}
protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start,
DateTime ende)
{
var flsSoll = BerechneFlsSoll(ed.Employee, contract, start, ende, ed.StundenSollOhneUrlaubKrankheit, ed.StundenSollOhneUrlaubKrankheit);
//protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start,
// DateTime ende)
//{
// var flsSoll = BerechneFlsSoll(ed.Employee, contract, start, ende, ed.StundenSollOhneUrlaubKrankheit, ed.StundenSollOhneUrlaubKrankheit);
var diff = ed.FlsIst - flsSoll;
// var diff = ed.FlsIst - flsSoll;
var std = Math.Round(Math.Round(diff, 2, MidpointRounding.AwayFromZero) * (4m / 3m), 2, MidpointRounding.AwayFromZero);
//std *= (4 / 3);
//if (ed.UeberstundenVormonat.HasValue && ed.UeberstundenVormonat.Value > 0)
//{
// int test = 0;
//}
decimal stunden = 0;
BerechneExtraUeberstunden(ed.Employee, start, ende, out stunden);
// var std = Math.Round(Math.Round(diff, 2, MidpointRounding.AwayFromZero) * (4m / 3m), 2, MidpointRounding.AwayFromZero);
// //std *= (4 / 3);
// //if (ed.UeberstundenVormonat.HasValue && ed.UeberstundenVormonat.Value > 0)
// //{
// // int test = 0;
// //}
// decimal stunden = 0;
// BerechneExtraUeberstunden(ed.Employee, start, ende, out stunden);
std += stunden;
// std += stunden;
return std + (ed.UeberstundenVormonat ?? 0);
}
// std += 100000;
// return std + (ed.UeberstundenVormonat ?? 0);
//}
}
}

View File

@@ -54,6 +54,7 @@ namespace BeWo.BetreuWoReports
this.lblTotalMinutes = new DevExpress.XtraReports.UI.XRLabel();
this.lblHoursMinutesString = new DevExpress.XtraReports.UI.XRLabel();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.lblApprovedMinutes = new DevExpress.XtraReports.UI.XRLabel();
@@ -78,7 +79,6 @@ namespace BeWo.BetreuWoReports
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -337,6 +337,18 @@ namespace BeWo.BetreuWoReports
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.99998F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(433.33F, 20F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Az.: [ReferenceNumber]";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrPageInfo1
//
this.xrPageInfo1.Format = "{0:dd.MM.yyyy}";
@@ -527,7 +539,7 @@ namespace BeWo.BetreuWoReports
this.xrLabel8.SizeF = new System.Drawing.SizeF(140F, 20F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Fallmanager/in:";
this.xrLabel8.Text = "Mitarbeiter:in";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel1
@@ -557,18 +569,6 @@ namespace BeWo.BetreuWoReports
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.99998F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(433.33F, 20F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Az.: [ReferenceNumber]";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// StundenzettelALS
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -575,7 +575,7 @@ namespace BeWo.BetreuWoReports
this.xrLabel8.SizeF = new System.Drawing.SizeF(140F, 20F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Fallmanager/in:";
this.xrLabel8.Text = "Mitarbeiter:in";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel6

View File

@@ -100,6 +100,80 @@ namespace DomizielAnsbach
return new XtraReport();
}
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
if (lROs.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid);
rootReport.CreateDocument();
for (int i = 1; i < lROs.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid);
if (lNext.Pages.Count == 0)
{
lNext.CreateDocument();
}
rootReport.Pages.AddRange(lNext.Pages);
}
return rootReport;
}
return new XtraReport();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
return CreateServicesOverviewReportForRo(ro, serviceCategoryOid);
}
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
XtraReport report = null;
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO pbRo = ServicesOverviewRO.CopyFromRO(ro);
if (ro.Services != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
//if (!s.ServiceCategory.StartsWith("Dienstleistung"))
//{
if (s.ServiceCategory.Contains("Ambulant Betreutes "))
{
bewoRo.Services.Add(s);
}
else
{
pbRo.Services.Add(s);
}
}
}
report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegAbw(), bewoRo);
report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegPB(), pbRo);
if (report == null)
report = new XtraReport();
return report as XtraReport;
}
}
}

View File

@@ -49,6 +49,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Invoicing\InvoiceHelper.cs" />
<Compile Include="Invoicing\PBInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomCalculations.cs" />
<Compile Include="Invoicing\AbwInvoiceCreation.cs" />

View File

@@ -93,6 +93,12 @@ namespace DomizielAnsbach.Invoicing
{
cat = scap.ServiceCategory.Name;
}
if (cat.Contains("stationär"))
{
}
foreach (var billingData in data)
{
serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem
@@ -107,6 +113,8 @@ namespace DomizielAnsbach.Invoicing
ItemDescription = cat
});
}
}
}
}

View File

@@ -0,0 +1,17 @@
using BeWo.Data.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DomizielAnsbach.Invoicing
{
public class InvoiceHelper
{
public IList<InvoiceItem> BerechneRechnungsPositionenFuerStationaer()
{
}
}
}

View File

@@ -138,7 +138,13 @@ namespace DomizielAnsbach.Invoicing
foreach (var at in customer.AbsenceTimes)
{
if (at.Start.HasValue && at.Start.Value < monatEnde && (!at.End.HasValue || at.End.Value >= monatStart))
DateTime? startAbw = at.Start;
DateTime? endMinusEinTag = at.End;
if (at.Start.HasValue && at.End.HasValue && at.End.Value.Date.Subtract(at.Start.Value.Date).TotalDays > 0)
{
endMinusEinTag = at.End.Value.AddDays(-1);
}
if (startAbw.HasValue && startAbw.Value < monatEnde && (!endMinusEinTag.HasValue || endMinusEinTag.Value >= monatStart))
{
DateTime abwStart = at.Start.Value;
if (start > abwStart)
@@ -147,9 +153,9 @@ namespace DomizielAnsbach.Invoicing
}
DateTime abwEnd = monatEnde.AddDays(-1);
if (at.End.HasValue && at.End < monatEnde)
if (endMinusEinTag.HasValue && endMinusEinTag < monatEnde)
{
abwEnd = at.End.Value;
abwEnd = endMinusEinTag.Value;
}
DateTime dt = abwStart;

View File

@@ -31,10 +31,13 @@ namespace DomizielAnsbach
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegAbw));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -44,11 +47,10 @@ namespace DomizielAnsbach
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
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();
@@ -76,9 +78,20 @@ namespace DomizielAnsbach
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -92,15 +105,15 @@ namespace DomizielAnsbach
//
// xrTableServiceRecords1
//
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(670F, 60F);
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(670F, 110F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -109,39 +122,46 @@ namespace DomizielAnsbach
//
// xrTableRow2
//
this.xrTableRow2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(217)))), ((int)(((byte)(241)))));
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell6,
this.xrTableCell1,
this.xrTableCell4,
this.xrTableCell11});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseBackColor = false;
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.Weight = 1.875D;
this.xrTableRow2.Weight = 3.4375D;
//
// xrTableCell3
//
this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseBackColor = false;
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.Weight = 0.26824509954648823D;
this.xrTableCell3.Weight = 0.2194732635305279D;
//
// xrTableCell6
//
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Dauer\r\nder\r\nindirekten\r\nklienten-\r\nbezogenen\r\nTätigkeiten\r\n";
this.xrTableCell6.Weight = 0.20728030270315478D;
//
// xrTableCell1
//
this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBackColor = false;
this.xrTableCell1.Text = "Dauer des Kontaktes";
this.xrTableCell1.Weight = 0.26824509735842855D;
this.xrTableCell1.Text = "Dauer\r\nder\r\ndirekten\r\nKlienten-\r\nkontakte";
this.xrTableCell1.Weight = 0.2072803027031547D;
//
// xrTableCell4
//
this.xrTableCell4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseBackColor = false;
this.xrTableCell4.StylePriority.UsePadding = false;
@@ -150,21 +170,21 @@ namespace DomizielAnsbach
//
// xrTableCell11
//
this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Unterschrift Budgetnehmer";
this.xrTableCell11.Weight = 0.31701693373906548D;
this.xrTableCell11.Text = "Berufs-\r\ngruppe";
this.xrTableCell11.Weight = 0.21947326170714482D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1});
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -176,7 +196,6 @@ namespace DomizielAnsbach
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.Font = new System.Drawing.Font("Arial", 11F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -186,7 +205,7 @@ namespace DomizielAnsbach
// xrTable3
//
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
@@ -202,6 +221,7 @@ namespace DomizielAnsbach
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13,
this.xrTableCell2,
this.xrTableCell7,
this.xrTableCell15,
this.xrTableCell5});
this.xrTableRow6.Name = "xrTableRow6";
@@ -220,18 +240,30 @@ namespace DomizielAnsbach
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.Weight = 0.13888887377323028D;
this.xrTableCell13.Weight = 0.11363635923509893D;
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##} Min.")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified", "{0:0.##} Min.")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell2.Weight = 0.13888887698574931D;
this.xrTableCell2.Weight = 0.10732323140481673D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell7.Weight = 0.10732322845341978D;
//
// xrTableCell15
//
@@ -244,44 +276,27 @@ namespace DomizielAnsbach
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell15.Weight = 0.40404036892472889D;
this.xrTableCell15.Weight = 0.40404038746507664D;
//
// xrTableCell5
//
this.xrTableCell5.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.picSignature});
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "SP";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.16414128592247781D;
//
// picSignature
//
this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(130F, 25F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
this.xrTableCell5.Weight = 0.11363619904777417D;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F);
this.GroupHeader1.HeightF = 60F;
this.GroupHeader1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupHeader1.HeightF = 110F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -305,7 +320,7 @@ namespace DomizielAnsbach
this.xrLabel12,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
this.ReportHeader.HeightF = 250F;
this.ReportHeader.HeightF = 320F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -320,23 +335,21 @@ namespace DomizielAnsbach
// xrLabel29
//
this.xrLabel29.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 200F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 265F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(363.8367F, 29.99997F);
this.xrLabel29.StylePriority.UseBorders = false;
this.xrLabel29.StylePriority.UseFont = false;
this.xrLabel29.Text = "[Month] [Year]";
//
// lblBewilligteStunden
//
this.lblBewilligteStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.0} h/Woche")});
this.lblBewilligteStunden.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 170F);
this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 235F);
this.lblBewilligteStunden.Name = "lblBewilligteStunden";
this.lblBewilligteStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F);
this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(363.8367F, 29.99997F);
this.lblBewilligteStunden.StylePriority.UseBorders = false;
this.lblBewilligteStunden.StylePriority.UseFont = false;
//
@@ -345,10 +358,10 @@ namespace DomizielAnsbach
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate")});
this.xrLabel25.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 140F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 205F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(363.8367F, 30.00003F);
this.xrLabel25.StylePriority.UseBorders = false;
this.xrLabel25.StylePriority.UseFont = false;
//
@@ -357,10 +370,10 @@ namespace DomizielAnsbach
this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "{0:dd.MM.yyyy}")});
this.xrLabel24.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 110F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 175F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(363.8367F, 30.00002F);
this.xrLabel24.StylePriority.UseBorders = false;
this.xrLabel24.StylePriority.UseFont = false;
//
@@ -369,17 +382,17 @@ namespace DomizielAnsbach
this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
this.xrLabel23.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 80.00002F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 145F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(220.5033F, 29.99999F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(363.8367F, 29.99998F);
this.xrLabel23.StylePriority.UseBorders = false;
this.xrLabel23.StylePriority.UseFont = false;
//
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 265F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -389,7 +402,7 @@ namespace DomizielAnsbach
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 235F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -399,7 +412,7 @@ namespace DomizielAnsbach
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 205F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -409,7 +422,7 @@ namespace DomizielAnsbach
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 175F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(269.9133F, 29.99999F);
@@ -419,7 +432,7 @@ namespace DomizielAnsbach
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00002F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 145F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -429,14 +442,14 @@ namespace DomizielAnsbach
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 65F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(480F, 36.45833F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Monatsübersicht für Persönliches Budget";
this.xrLabel1.Text = "Monatsübersicht für Betreutes Wohnen";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// formattingRuleServiceDesc
@@ -475,19 +488,20 @@ namespace DomizielAnsbach
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
this.xrLabel6,
this.xrLabel5});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
this.ReportFooter.HeightF = 80.08324F;
this.ReportFooter.HeightF = 102.5832F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(536.6738F, 84.58323F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F);
@@ -498,7 +512,7 @@ namespace DomizielAnsbach
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(175F, 84.58323F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F);
@@ -509,7 +523,7 @@ namespace DomizielAnsbach
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.6944444F, 62.08327F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.58323F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(121.7362F, 17.99997F);
@@ -520,7 +534,7 @@ namespace DomizielAnsbach
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.72221F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.22221F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(670.0001F, 10.36106F);
@@ -546,7 +560,120 @@ namespace DomizielAnsbach
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// QuittierungsbelegPB
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(666.9999F, 51.72221F);
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Erläuterung: Eventuelle Gruppenzeiten sind berechnet nach der Formel Gruppendauer" +
" : 3 x Anzahl\r\nder Mitarbeiter/innen";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.HeightF = 25F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.Color.Black;
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 25F);
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell12,
this.xrTableCell14});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableRow1.Weight = 1.25D;
//
// xrTableCell8
//
this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Summe";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.11363635923509893D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified")});
this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:0.##}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell9.Summary = xrSummary1;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell9.Weight = 0.10732323140481673D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:0.##}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell10.Summary = xrSummary2;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell10.Weight = 0.10732322845341978D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F);
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell12.Weight = 0.40404038746507664D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell14.Weight = 0.11363619904777417D;
//
// QuittierungsbelegAbw
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -560,6 +687,7 @@ namespace DomizielAnsbach
this.fieldBillableFLS,
this.fieldAbrechenbareFLS});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,
@@ -574,6 +702,7 @@ namespace DomizielAnsbach
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -624,6 +753,16 @@ namespace DomizielAnsbach
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
}
}

View File

@@ -23,40 +23,32 @@ namespace DomizielAnsbach
public void SetReportDataSource(ServicesOverviewRO pRO)
{
if (pRO.Services != null)
String betreuungsschluessel = "";
double minuten = 0;
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
double minuten = 0;
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
minuten += s.Minutes;
if (s.ServiceCategory.Contains("Indirekt"))
{
if (s.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(s);
if (s.ServiceCategory.ToLower().IndexOf("assistenz") < 0)
{
servicesBillable.Add(s);
minuten += s.Minutes;
}
}
s.MinutesUnqualified = s.Minutes;
s.MinutesQualified = 0;
}
else
{
s.MinutesQualified = s.Minutes;
s.MinutesUnqualified = 0;
}
if (String.IsNullOrEmpty(betreuungsschluessel) && s.ServiceCategory.Contains("Ambulant Betreutes "))
{
betreuungsschluessel = s.ServiceCategory.Replace("Ambulant Betreutes Einzelwohnen", "").Trim();
}
pRO.TotalFLMBillable = minuten;
pRO.Services = servicesBillable;
}
var approved = pRO.ApprovedFLSPerWeek;
SupportConceptPeriodStatisticsDC stats = GetFlsStatistics(pRO, "assistenz"); ;
if (stats != null)
{
approved = stats.MinutesApprovedPerWeek / 60;
}
lblBewilligteStunden.Text = string.Format("{0:0.##}", approved);
lblBewilligteStunden.Text = betreuungsschluessel;
pRO.TotalFLMBillable = minuten;
this.bindingSource1.DataSource = pRO;
}

View File

@@ -109,6 +109,7 @@ namespace DomizielAnsbach
//
// xrTableRow2
//
this.xrTableRow2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(217)))), ((int)(((byte)(241)))));
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell1,
@@ -116,12 +117,12 @@ namespace DomizielAnsbach
this.xrTableCell11});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseBackColor = false;
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.Weight = 1.875D;
//
// xrTableCell3
//
this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseBackColor = false;
this.xrTableCell3.StylePriority.UseFont = false;
@@ -132,7 +133,6 @@ namespace DomizielAnsbach
//
// xrTableCell1
//
this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBackColor = false;
@@ -141,7 +141,6 @@ namespace DomizielAnsbach
//
// xrTableCell4
//
this.xrTableCell4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseBackColor = false;
this.xrTableCell4.StylePriority.UsePadding = false;
@@ -150,7 +149,6 @@ namespace DomizielAnsbach
//
// xrTableCell11
//
this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243)))));
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
@@ -176,7 +174,6 @@ namespace DomizielAnsbach
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.Font = new System.Drawing.Font("Arial", 11F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -272,7 +269,7 @@ namespace DomizielAnsbach
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F);
this.GroupHeader1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold);
this.GroupHeader1.HeightF = 60F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
@@ -305,7 +302,7 @@ namespace DomizielAnsbach
this.xrLabel12,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
this.ReportHeader.HeightF = 250F;
this.ReportHeader.HeightF = 320F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -320,10 +317,10 @@ namespace DomizielAnsbach
// xrLabel29
//
this.xrLabel29.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 200F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 265F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(362.17F, 29.99997F);
this.xrLabel29.StylePriority.UseBorders = false;
this.xrLabel29.StylePriority.UseFont = false;
this.xrLabel29.Text = "[Month] [Year]";
@@ -333,10 +330,10 @@ namespace DomizielAnsbach
this.lblBewilligteStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.0} h/Woche")});
this.lblBewilligteStunden.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 170F);
this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 235F);
this.lblBewilligteStunden.Name = "lblBewilligteStunden";
this.lblBewilligteStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F);
this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(362.17F, 29.99998F);
this.lblBewilligteStunden.StylePriority.UseBorders = false;
this.lblBewilligteStunden.StylePriority.UseFont = false;
//
@@ -345,10 +342,10 @@ namespace DomizielAnsbach
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate")});
this.xrLabel25.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 140F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 205F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(362.17F, 30.00002F);
this.xrLabel25.StylePriority.UseBorders = false;
this.xrLabel25.StylePriority.UseFont = false;
//
@@ -357,10 +354,10 @@ namespace DomizielAnsbach
this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "{0:dd.MM.yyyy}")});
this.xrLabel24.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 110F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 175F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(362.17F, 30.00002F);
this.xrLabel24.StylePriority.UseBorders = false;
this.xrLabel24.StylePriority.UseFont = false;
//
@@ -369,17 +366,17 @@ namespace DomizielAnsbach
this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
this.xrLabel23.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 80.00002F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 145F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(220.5033F, 29.99999F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(362.17F, 29.99998F);
this.xrLabel23.StylePriority.UseBorders = false;
this.xrLabel23.StylePriority.UseFont = false;
//
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -389,7 +386,7 @@ namespace DomizielAnsbach
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -399,7 +396,7 @@ namespace DomizielAnsbach
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -409,7 +406,7 @@ namespace DomizielAnsbach
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(269.9133F, 29.99999F);
@@ -419,7 +416,7 @@ namespace DomizielAnsbach
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00002F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(269.9133F, 30F);
@@ -429,7 +426,7 @@ namespace DomizielAnsbach
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -560,6 +557,7 @@ namespace DomizielAnsbach
this.fieldBillableFLS,
this.fieldAbrechenbareFLS});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Calibri", 11F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,

View File

@@ -22,6 +22,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing
{
private const decimal VERPFLEGUNGSPAUSCHALE_BISDez2020 = 3.40m;
private const decimal VERPFLEGUNGSPAUSCHALE_ABJan2021 = 3.50m;
private const decimal VERPFLEGUNGSPAUSCHALE_ABJan2022 = 3.60m;
public override void SetInvoiceId(ServiceInvoice invoice)
@@ -149,8 +150,11 @@ namespace LebenshilfeFrankfurtOder.Invoicing
SetServiceInvoicePeriods(invoice, sc, invoicePeriod);
decimal verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2021;
decimal verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2022;
if (invoicePeriod.StartDate < new DateTime(2022, 1, 1))
{
verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2021;
}
if (invoicePeriod.StartDate < new DateTime(2021, 1, 1))
{
verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_BISDez2020;

View File

@@ -70,8 +70,9 @@ namespace BeWo.LebenshilfeWetterau
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -107,7 +108,7 @@ namespace BeWo.LebenshilfeWetterau
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 15F;
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupFooter
@@ -212,10 +213,9 @@ namespace BeWo.LebenshilfeWetterau
this.xrLabel5,
this.xrLabel3,
this.xrLabel1,
this.xrLabel2,
this.xrTable5});
this.xrLabel2});
this.Page1.Font = new System.Drawing.Font("Arial", 10F);
this.Page1.HeightF = 169.375F;
this.Page1.HeightF = 109.375F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseBorders = false;
this.Page1.StylePriority.UseFont = false;
@@ -323,7 +323,7 @@ namespace BeWo.LebenshilfeWetterau
this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable5.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 109.375F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
@@ -403,7 +403,8 @@ namespace BeWo.LebenshilfeWetterau
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.GroupHeader1});
this.DetailReport.DataMember = "ServiceInvoicePeriods";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -535,10 +536,6 @@ namespace BeWo.LebenshilfeWetterau
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell18.Weight = 0.35785886809670403D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// fieldMonatskontingent
//
this.fieldMonatskontingent.DataMember = "ServiceInvoicePeriods";
@@ -546,6 +543,18 @@ namespace BeWo.LebenshilfeWetterau
this.fieldMonatskontingent.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldMonatskontingent.Name = "fieldMonatskontingent";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.GroupHeader1.HeightF = 60F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// Sammelrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -565,7 +574,7 @@ namespace BeWo.LebenshilfeWetterau
this.ruleRateFactorNull,
this.ruleNoticeNull});
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(50, 50, 40, 15);
this.Margins = new System.Drawing.Printing.Margins(50, 50, 40, 50);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -622,5 +631,6 @@ namespace BeWo.LebenshilfeWetterau
private DevExpress.XtraReports.UI.XRTableCell cellTotalPerMonth;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
}
}

View File

@@ -13,7 +13,28 @@ namespace LebenshilfeWetterau.Invoicing
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
foreach (var list in supportConcepts2ServiceRecords.Values)
if (supportConcepts2ServiceRecords.Count > 1)
{
foreach (var item in supportConcepts2ServiceRecords)
{
var csc = item.Key;
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(csc.CostBearerRelOids[0]);
var org = cb2sc.CostBearer.Organisation;
if (org.Name != null && org.Name == "LWV-Hessen")
{
return new CollectiveInvoiceCreation();
}
}
}
foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)
@@ -25,31 +46,16 @@ namespace LebenshilfeWetterau.Invoicing
}
}
foreach (var item in supportConcepts2ServiceRecords)
{
var csc = item.Key;
if (supportConcepts2ServiceRecords.Count == 1)
{
csc.IsApproved = true;
return new CustomInvoiceCreation();
}
//csc.IsApproved = true;
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(csc.CostBearerRelOids[0]);
var org = cb2sc.CostBearer.Organisation;
if (org.Name != null && org.Name == "LWV-Hessen")
{
return new CollectiveInvoiceCreation();
}
}
if (supportConcepts2ServiceRecords.Count == 1)
{
foreach (var item in supportConcepts2ServiceRecords)
{
var csc = item.Key;
csc.IsApproved = true;
return new CustomInvoiceCreation();
}
}
return new CustomInvoiceCreation();

View File

@@ -32,27 +32,38 @@ namespace MuenchenerAidsHilfeEV
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
@@ -74,34 +85,22 @@ namespace MuenchenerAidsHilfeEV
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -116,11 +115,20 @@ namespace MuenchenerAidsHilfeEV
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel6,
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.HeightF = 143.3333F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(368.6666F, 17.00001F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "müah / postfach 150808 / 80337 München";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
@@ -138,17 +146,25 @@ namespace MuenchenerAidsHilfeEV
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 90.83334F;
this.topMarginBand1.HeightF = 91F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText4,
this.xrRichText3,
this.xrRichText2,
this.xrRichText1,
this.xrLabel8});
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.xrLabel2,
this.xrTable1,
this.xrLabel10,
this.lblAdresse,
@@ -157,10 +173,125 @@ namespace MuenchenerAidsHilfeEV
this.xrLabel5,
this.lblAbrechnungszeitraum,
this.xrTable2});
this.Page1.HeightF = 354.0833F;
this.Page1.HeightF = 394.0833F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(333.1252F, 139.1667F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow6,
this.xrTableRow7});
this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 60F);
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2,
this.xrTableCell5});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Debitoren-Nr.:";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell2.Weight = 0.43933283562699876D;
//
// xrTableCell5
//
this.xrTableCell5.CanShrink = true;
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")});
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell5.Weight = 0.56066716437300124D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell10,
this.xrTableCell14});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.13245033112582783D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Rechnungsdatum:";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell10.Weight = 0.43933283562699876D;
//
// xrTableCell14
//
this.xrTableCell14.CanShrink = true;
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell14.Weight = 0.56066716437300124D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell15,
this.xrTableCell16});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.13245033112582783D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Rechnungsnr.:";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell15.Weight = 0.43933283562699876D;
//
// xrTableCell16
//
this.xrTableCell16.CanShrink = true;
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell16.Weight = 0.56066716437300124D;
//
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(332.9584F, 110.2083F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(343.8747F, 16.99999F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Bitte bei Zahlung angeben:";
//
// lblAdresse
//
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -174,23 +305,24 @@ namespace MuenchenerAidsHilfeEV
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.5F);
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 271.6667F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Aktenzeichen: [CustomerReferenceNumber]";
this.xrLabel4.Text = "Bewilligungszeitraum: [AccountingPeriodStart!dd.MM.yyyy] bis [AccountingPeriodEnd" +
"!dd.MM.yyyy]";
this.xrLabel4.WordWrap = false;
//
// xrLabel3
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.5F);
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.6667F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
@@ -202,7 +334,7 @@ namespace MuenchenerAidsHilfeEV
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 337.5F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -211,7 +343,7 @@ namespace MuenchenerAidsHilfeEV
//
// lblAbrechnungszeitraum
//
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F);
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.5F);
this.lblAbrechnungszeitraum.Multiline = true;
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -230,10 +362,28 @@ namespace MuenchenerAidsHilfeEV
this.xrTableRow1});
this.xrTable2.SizeF = new System.Drawing.SizeF(343.8747F, 80F);
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.13245033112582783D;
//
// xrTableCell13
//
this.xrTableCell13.CanShrink = true;
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell13.Weight = 1D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell11});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.13245033112582783D;
@@ -248,79 +398,56 @@ namespace MuenchenerAidsHilfeEV
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell11.Weight = 0.62367480382481233D;
this.xrTableCell11.Weight = 1D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.13245033112582783D;
//
// xrTableCell8
//
this.xrTableCell8.CanShrink = true;
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell8.Weight = 1D;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
//
// xrTableCell1
//
this.xrTableCell1.CanShrink = true;
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell1.Weight = 1D;
//
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.08334F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(666.9999F, 59.50002F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.Text = "Mit freundlichen Grüßen";
//
// xrTable4
//
this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10,
this.xrTableRow14});
this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F);
this.xrTable4.StylePriority.UseFont = false;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9});
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 0.38095238095238093D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.Text = "xrTableCell1";
this.xrTableCell9.Weight = 3D;
//
// xrTableRow14
//
this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12});
this.xrTableRow14.Name = "xrTableRow14";
this.xrTableRow14.Weight = 0.23809523809523808D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 3D;
//
// xrLabel14
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "[CreatorName]";
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "Abschließende Bemerkungen:";
this.xrLabel15.Text = "Zahlung sofort nach Rechnungserhalt ohne Abzug.\r\n\r\nDiese Rechnung wurde maschinel" +
"l erstellt und ist ohne Unterschrift gültig.";
//
// DetailReport
//
@@ -557,18 +684,15 @@ namespace MuenchenerAidsHilfeEV
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel9,
this.xrTable4,
this.xrLabel14,
this.xrLabel15});
this.GroupFooter1.HeightF = 206.5833F;
this.GroupFooter1.HeightF = 126.5834F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -583,230 +707,82 @@ namespace MuenchenerAidsHilfeEV
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel6
// xrLabel2
//
this.xrLabel6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Underline);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(368.6666F, 17.00001F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "müah / postfach 150808 / 80337 München";
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.6667F);
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(650F, 20F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung";
this.xrLabel2.WordWrap = false;
//
// xrTableCell3
// xrLabel7
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Telefon:";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell3.Weight = 0.37632519617518773D;
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 291.6667F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel7.StylePriority.UseBackColor = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Aktenzeichen: [CustomerReferenceNumber]";
this.xrLabel7.WordWrap = false;
//
// xrTableCell1
// xrLabel8
//
this.xrTableCell1.CanShrink = true;
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell1.Weight = 0.62367480382481233D;
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(676.83F, 5F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
//
// xrTableRow1
// xrRichText1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell7,
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(122.4721F, 65F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrTableCell8
// xrRichText2
//
this.xrTableCell8.CanShrink = true;
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell8.Weight = 0.62367480382481233D;
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(122.4721F, 5F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(223.7504F, 65F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrTableRow3
// xrRichText3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell8});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.13245033112582783D;
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(346.2225F, 5F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(159.9721F, 65F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrTableCell13
// xrRichText4
//
this.xrTableCell13.CanShrink = true;
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell13.Weight = 0.62367480382481233D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4,
this.xrTableCell13});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.13245033112582783D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Bearbeiter:";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell4.Weight = 0.37632519617518773D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "Fax:";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell6.Weight = 0.37632519617518773D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "E-Mail:";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell7.Weight = 0.37632519617518773D;
//
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(332.9584F, 110.2083F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(343.8747F, 16.99999F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Bitte bei Zahlung angeben:";
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(333.1252F, 139.1667F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow6,
this.xrTableRow7});
this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 60F);
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2,
this.xrTableCell5});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Debitoren-Nr.:";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell2.Weight = 0.43933283562699876D;
//
// xrTableCell5
//
this.xrTableCell5.CanShrink = true;
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")});
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell5.Weight = 0.56066716437300124D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell10,
this.xrTableCell14});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.13245033112582783D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Rechnungsdatum:";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell10.Weight = 0.43933283562699876D;
//
// xrTableCell14
//
this.xrTableCell14.CanShrink = true;
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell14.Weight = 0.56066716437300124D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell15,
this.xrTableCell16});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.13245033112582783D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Rechnungsnr.:";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell15.Weight = 0.43933283562699876D;
//
// xrTableCell16
//
this.xrTableCell16.CanShrink = true;
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell16.Weight = 0.56066716437300124D;
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(506.1947F, 5F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(185.8053F, 65F);
this.xrRichText4.StylePriority.UseFont = false;
//
// ServiceInvoiceReport
//
@@ -819,20 +795,23 @@ namespace MuenchenerAidsHilfeEV
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Verdana", 10F);
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 91, 50);
this.Margins = new System.Drawing.Printing.Margins(75, 60, 91, 100);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -853,13 +832,6 @@ namespace MuenchenerAidsHilfeEV
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable5;
@@ -885,14 +857,10 @@ namespace MuenchenerAidsHilfeEV
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
@@ -904,5 +872,12 @@ namespace MuenchenerAidsHilfeEV
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
}
}

View File

@@ -16,6 +16,8 @@ namespace MuenchenerAidsHilfeEV
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
pRO.InvoiceDate = String.Format("{0:dd.MM.yyyy}", new DateTime(pRO.InvoiceDateTime.Value.Year, pRO.InvoiceDateTime.Value.Month, 1));
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
@@ -44,11 +46,11 @@ namespace MuenchenerAidsHilfeEV
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Leistungen:", start);
}
else
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Leistungen:", start, end);
}
this.bindingSource1.DataSource = pRO;

View File

@@ -179,6 +179,18 @@
R/2i7u0e1ha28hrjyTGCnmlOX29Nx7nrSK6n/9k=
</value>
</data>
<data name="xrRichText4.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEcATABTACAARwBlAG0AZQBpAG4AcwBjAGgAYQBmAHQAcwBiAGEAbgBrACAAZQBHAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEwAWgA6ACAANAAzADAANgAwADkANgA3ACAAIAAgACAAIAAgAEsAVABPADoAIAA4ADIANAAzADMAMQA4ADMAMAAwAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEkAQwA6ACAARwBFAE4ATwBEAEUATQAxAEcATABTAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABJAEIAQQBOADoAIABEAEUANwAzACAANAAzADAANgAgADAAOQA2ADcAIAA4ADIANAAzACAAMwAxADgAMwAgADAAMAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABLAG8AbgB0AGEAawB0AH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABUAGUAbABlAGYAbwBuADoAIAAwADgAOQAvADUANAAzADMAMwAtADAAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFQAZQBsAGUAZgBhAHgAOgAgADAAOAA5AC8ANQA0ADMAMwAzAC0AMQAxADEAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAE0AYQBpAGwAOgAgAGkAbgBmAG8AQABtAHUAZQBuAGMAaABuAGUAcgAtAGEAaQBkAHMAaABpAGwAZgBlAC4AZABlAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABXAGUAYgA6ACAAdwB3AHcALgBtAHUAZQBuAGMAaABuAGUAcgAtAGEAaQBkAHMAaABpAGwAZgBlAC4AZABlAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABWAGUAcgBlAGkAbgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAwACAARwBlAHMAYwBoAFwAdQAyADIAOABcACcAZQA0AGYAdABzAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAGUAcgA6ACAARAByAC4AIABUAG8AYgBpAGEAcwAgAE8AbABpAHYAZQBpAHIAYQAgAFcAZQBpAHMAbQBhAG4AdABlAGwAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFYAZQByAGUAaQBuAHMAcgBlAGcAaQBzAHQAZQByADoAIABWAFIAMQAxADMAOQA2ACwAIABBAG0AdABzAGcAZQByAGkAYwBoAHQAIABNAFwAdQAyADUAMgBcACcAZgBjAG4AYwBoAGUAbgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAwACAAVQBTAHQALgAtAEkAZABOAHIALgA6ACAARABFACAAMgAwADYAMwA2ADIAMwAxADcAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFMAdABlAHUAZQByAG4AdQBtAG0AZQByADoAIAAxADQAMwAvADIAMQA5AC8ANAAwADYANQAwAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABBAG4AcwBjAGgAcgBpAGYAdAB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATQBcAHUAMgA1ADIAXAAnAGYAYwBuAGMAaABuAGUAcgAtAEEAaQBkAHMAaABpAGwAZgBlACAAZQAuAFYALgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATABpAG4AZAB3AHUAcgBtAHMAdAByAC4AIAA3ADEAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgADgAMAAzADMANwAgAE0AXAB1ADIANQAyAFwAJwBmAGMAbgBjAGgAZQBuAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABEAGUAdQB0AHMAYwBoAGwAYQBuAGQAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>

View File

@@ -11,6 +11,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.BargeldtransaktionVersion = pEntity.Version;
//pDataContract.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(pEntity.Customer);
pDataContract.Betrag = pEntity.Betrag;
pDataContract.Belegnummer = pEntity.Belegnummer;
pDataContract.Zahlungstyp = pEntity.Zahlungstyp;
pDataContract.Zahlungsdatum = pEntity.Zahlungsdatum;
pDataContract.Transaktionskassenbestand = pEntity.Transaktionskassenbestand;
@@ -27,6 +28,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Oid = pDataContract.BargeldtransaktionOid;
//pEntity.Customer = MapperFactory.CompactCustomerDC_Customer.MergeWithEntity(pDataContract.Customer, pEntity.Customer);
pEntity.Betrag = pDataContract.Betrag;
pEntity.Belegnummer = pDataContract.Belegnummer;
pEntity.Zahlungstyp = pDataContract.Zahlungstyp;
pEntity.Zahlungsdatum = pDataContract.Zahlungsdatum;
pEntity.Transaktionskassenbestand = pDataContract.Transaktionskassenbestand;

View File

@@ -172,7 +172,7 @@ namespace BeWo.Service.Plugins
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
//t = "2632162696"; // Pro BeWo Düren
//t = "6340891020"; // Caritas Ahlen
t = "3659854106"; // alpha e.V.
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach
//t = "2331203795"; // BeWo für dich
@@ -280,7 +280,7 @@ namespace BeWo.Service.Plugins
//t = "8283849714"; // Forum e.V. (proviel GmbH)
//t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia)
//t = "2387527289"; // Lebenshilfe Duisburg HPFH
//t = "5595701056"; // Domiziel Ansbach
t = "5595701056"; // Domiziel Ansbach
//t = "9430188510"; // Pro INTEGRA
//t = "4820371076"; // Zuhause Wohnen Iris Thimm
//t = "1078667960"; // FAM Rhein-Sieg Gbr

View File

@@ -531,6 +531,7 @@ namespace BS.Shared
PivotTabelleAnsehen = 29003,
DienstplanungAnsehen = 29004,
AbwesenheitsPlanungAnsehen = 29005,
KilometerauswertungEigene_View = 29010,
VertretungenView_View = 30000,
@@ -541,6 +542,8 @@ namespace BS.Shared
Person_FamilyView = 40010,
//FinanzenBargeldkassenBearbeiten = 50000,
Customer_Anonymization = 171717,
Customer_Full_Delete = 171718,
Person_Full_Delete = 171719,

View File

@@ -68,8 +68,9 @@ namespace BS.Shared.Core
UserRightType.AccountingTransactionView_Edit, Translator.Translate("Finanzen ändern")
},
{
UserRightType.AccountingTransactionView_View, Translator.Translate("Finanzen ansehen")
UserRightType.AccountingTransactionView_View, Translator.Translate("Finanzen ansehen (alle)")
},
{
UserRightType.AdministrationView_Create, Translator.Translate("Verwaltung anlegen")
},
@@ -239,7 +240,7 @@ namespace BS.Shared.Core
UserRightType.QueryView_View, Translator.Translate("Auswertungen ansehen")
},
{
UserRightType.Analysis_Settlement_View, Translator.Translate("Auswertungen Spitzabrechnung erstellen")
UserRightType.Analysis_Settlement_View, Translator.Translate("Finanzen Spitzabrechnung erstellen")
},
{
UserRightType.Analysis_EmployeeOverviewAll_View, Translator.Translate("Auswertungen für alle Mitarbeiter erstellen")
@@ -269,7 +270,11 @@ namespace BS.Shared.Core
UserRightType.Analysis_AuslastungTeam_View, Translator.Translate("Auswertung Mitarbeiterauslastung für alle Teams erstellen")
},
{
UserRightType.Kilometerauswertung_View, Translator.Translate("Auswertung über Kilometer erstellen")
UserRightType.Kilometerauswertung_View, Translator.Translate("Auswertung über Kilometer erstellen (für alle Mitarbeitenden)")
}
,
{
UserRightType.KilometerauswertungEigene_View, Translator.Translate("Auswertung über Kilometer erstellen (nur eigene)")
}
,
{

View File

@@ -31,7 +31,10 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Notice { get; set; }
[DataMember]
[DataMember]
public string Belegnummer { get; set; }
[DataMember]
public string InsUser { get; set; }
}
}

View File

@@ -53,7 +53,7 @@ namespace BS.Shared.DataContracts.Compact
{
get
{
string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " " + AddressString + " " + MainAttendant;
string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " " + AddressString + " " + MainAttendant + " " + Teams;
if (this.CostBearerReferenceNumbers != null)
{
lResult += string.Join(" ", this.CostBearerReferenceNumbers.Values.ToArray());

View File

@@ -20,7 +20,7 @@ namespace BS.Shared.DataContracts.Compact
}
public string FilterRelevants => String.Format("{0} {1} {2} {3} {4}", FirstName, LastName, PersonnelNumber, Details2, Details3);
public string FilterRelevants => String.Format("{0} {1} {2} {3} {4} {5}", FirstName, LastName, PersonnelNumber, Details2, Details3, Teams);
public string IconPath => @"..\..\Ressources\Icons\UserBusinessMaleDisabled.png";

View File

@@ -33,6 +33,7 @@
ServicesOverviewNew,
Stundenzettel,
VorlagenReport,
AbwesenheitsPrintReport
AbwesenheitsPrintReport,
MitarbeiterKlientenReport
}
}