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

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

Browse Source
This commit is contained in:
Christian
2022-04-14 15:04:14 +02:00
parent 22099eeff3 8131d832cf
commit ecda5cdf10
6 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
BeWo.sln
View File

@@ -517,6 +517,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlzeyTeilhabe", "ReportImp\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristopherusHausFamilienhilfe", "ReportImp\ChristopherusHausFamilienhilfe\ChristopherusHausFamilienhilfe.csproj", "{B104F622-7BE6-4DFE-9E20-32915507860D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akgg", "ReportImp\AKGG\Akgg.csproj", "{39876291-220B-412E-8ADE-B7A24621656D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkggMid", "ReportImp\AkggMid\AkggMid.csproj", "{B02A94EB-8D34-41D0-8E53-20F116240101}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4040,6 +4044,38 @@ Global
{B104F622-7BE6-4DFE-9E20-32915507860D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B104F622-7BE6-4DFE-9E20-32915507860D}.Release|x86.ActiveCfg = Release|Any CPU
{B104F622-7BE6-4DFE-9E20-32915507860D}.Release|x86.Build.0 = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|.NET.ActiveCfg = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|.NET.Build.0 = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|x86.ActiveCfg = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Debug|x86.Build.0 = Debug|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|.NET.ActiveCfg = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|.NET.Build.0 = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|Any CPU.Build.0 = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|x86.ActiveCfg = Release|Any CPU
{39876291-220B-412E-8ADE-B7A24621656D}.Release|x86.Build.0 = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|.NET.ActiveCfg = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|.NET.Build.0 = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|x86.ActiveCfg = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Debug|x86.Build.0 = Debug|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|.NET.ActiveCfg = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|.NET.Build.0 = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|Any CPU.Build.0 = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|x86.ActiveCfg = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4294,6 +4330,8 @@ Global
{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D173B437-EAD2-4535-B59D-76737600E058} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B104F622-7BE6-4DFE-9E20-32915507860D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{39876291-220B-412E-8ADE-B7A24621656D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B02A94EB-8D34-41D0-8E53-20F116240101} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

10
ReportImp/AKGG/Akgg.csproj
View File

@@ -71,6 +71,12 @@
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomGroupDurationCalculator.cs" />
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
@@ -109,6 +115,10 @@
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>

2
ReportImp/AKGG/Quittierungsbeleg.Designer.cs generated
View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace Kundexyz
namespace Akgg
{
partial class Quittierungsbeleg
{

2
ReportImp/AKGG/Quittierungsbeleg.cs
View File

@@ -8,7 +8,7 @@ using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace Kundexyz
namespace Akgg
{
public partial class Quittierungsbeleg : XtraReport, IBeWoReport<ServicesOverviewRO>
{

18
ReportImp/BeWoWalzPaiva/InvoiceCustomerReport.Designer.cs generated
View File

@@ -76,6 +76,7 @@ namespace BeWoWalzPaiva
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -547,6 +548,7 @@ namespace BeWoWalzPaiva
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel13,
this.xrLabel7,
this.xrLabel9,
this.xrLabel11,
@@ -591,6 +593,21 @@ namespace BeWoWalzPaiva
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "Bewo Walz&Paiva\r\nMorlaixplatz 13\r\n52146 Würselen\r\nTel.: 02405/4067133";
//
// xrLabel13
//
this.xrLabel13.BackColor = System.Drawing.Color.Transparent;
this.xrLabel13.CanShrink = true;
this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel13.StylePriority.UseBackColor = false;
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "IK-Nummer: 490 5040 21";
this.xrLabel13.WordWrap = false;
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -667,5 +684,6 @@ namespace BeWoWalzPaiva
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRRichText rtAnschrift1;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
}
}

2
Service/Plugins/PluginLoader.cs
View File

@@ -302,7 +302,7 @@ namespace BeWo.Service.Plugins
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbHd
//t = "8002913382"; // AKGG GmbH (MID)
t = "8002913382"; // AKGG GmbH (MID)
//t = "5155880294"; // BHV Bergische Hauspflege
//t = "8366649557"; // Münchner Aids-Hilfe e.V.
//t = "2976949196"; // WHB Refrath gGmbH