Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts: # ReportImp/AkggMid/CustomReportCreator.cs
This commit is contained in:
@@ -136,6 +136,12 @@
|
||||
<Compile Include="DefaultReports\BudgetnachweisAnhang.Designer.cs">
|
||||
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DefaultReports\PersonListReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DefaultReports\PersonListReport.Designer.cs">
|
||||
<DependentUpon>PersonListReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DefaultReports\CustomerListReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -437,6 +443,7 @@
|
||||
<Compile Include="DefaultReportCreator.cs" />
|
||||
<Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
|
||||
<Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" />
|
||||
<Compile Include="ReportObjects\PersonListRO.cs" />
|
||||
<Compile Include="ReportObjects\CustomerListRO.cs" />
|
||||
<Compile Include="ReportObjects\RatingRO.cs" />
|
||||
<Compile Include="ReportObjects\EmployeeCustomerListRO.cs" />
|
||||
@@ -496,6 +503,10 @@
|
||||
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DefaultReports\PersonListReport.resx">
|
||||
<DependentUpon>PersonListReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DefaultReports\CustomerListReport.resx">
|
||||
<DependentUpon>CustomerListReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
Reference in New Issue
Block a user