diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 618c1e9..1ba47a8 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2709,7 +2709,6 @@ namespace rmutr_report.Controllers bool startNumbering3 = false; bool startNumbering4 = false; bool startNumbering5 = false; - var detail = budget.details; foreach (var indetail in budget.details) { @@ -2878,18 +2877,8 @@ namespace rmutr_report.Controllers var budgetExpenditure = new List() { budget }; Report report = new Report(); - foreach (var d in detail) - { - if (d.row<=120) - { - report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); - } - if (d.row>120) - { - report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v3.frx"); - } - } - // report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); + + report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2"); report.Prepare(); diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index e2b33f8..a711059 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index f524aca..54f9720 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index ecd43eb..c3c2ff8 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3334b4cb0bef998976d0ff9b81e859de6a5d0173")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7e05f00fd365c536d3ee467c1f9eb3399596a61b")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index a0c0600..c05d69f 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87 +7ac3f37958a71820e8df5f45b5e179cc281750374662722aed13a4edc0d38b47 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index ecd43eb..c3c2ff8 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3334b4cb0bef998976d0ff9b81e859de6a5d0173")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7e05f00fd365c536d3ee467c1f9eb3399596a61b")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index a0c0600..c05d69f 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87 +7ac3f37958a71820e8df5f45b5e179cc281750374662722aed13a4edc0d38b47 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index fd013c2..350944b 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -e7d05b2e8e841ba91368833603be5e6447b2221d926b59fbe1f2f511b41fed99 +1cc1e30a55c8da36681abf907e9ced005ba9121991e772a39f582d11acbda306 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index e2b33f8..a711059 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index f524aca..54f9720 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 346ea57..f7d692c 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17246762284769178 \ No newline at end of file +17248180168527223 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index cd6f24c..f7d692c 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17247401489493512 \ No newline at end of file +17248180168527223 \ No newline at end of file diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx index 9983470..250c58f 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx @@ -1,5 +1,5 @@  - + @@ -90,7 +90,7 @@ - + diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx index 8fea2db..7f2bca0 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx @@ -1,5 +1,5 @@  - + @@ -90,7 +90,7 @@ - +