From 6c1f04df78937e636bd70f79df58291ce6edc1cc Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 4 Sep 2024 11:44:03 +0700
Subject: [PATCH] Bug Fixed

---
 bin/Debug/netcoreapp3.1/rmutr_report.dll      | Bin 2141696 -> 2141696 bytes
 bin/Debug/netcoreapp3.1/rmutr_report.pdb      | Bin 622364 -> 622364 bytes
 obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs |   2 +-
 .../rmutr_report.AssemblyInfoInputs.cache     |   2 +-
 .../rmutr_report.AssemblyInfo.cs              |   2 +-
 .../rmutr_report.AssemblyInfoInputs.cache     |   2 +-
 ...rmutr_report.RazorTargetAssemblyInfo.cache |   2 +-
 obj/Debug/netcoreapp3.1/rmutr_report.dll      | Bin 2141696 -> 2141696 bytes
 obj/Debug/netcoreapp3.1/rmutr_report.pdb      | Bin 622364 -> 622364 bytes
 ...Microsoft.AspNetCore.StaticWebAssets.props |  16 ++++++++
 .../rmutr_report.StaticWebAssets.Pack.cache   |   2 +-
 obj/rider.project.model.nuget.info            |   2 +-
 obj/rider.project.restore.info                |   2 +-
 ...get_expenditure_report_from_revenue_v2.frx |  36 +++++++++---------
 14 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll
index a1ee9be0cf270c9512ba172347421c77fda77f91..8136c0b4b77685d259d802b614dc9525439bc793 100644
GIT binary patch
delta 339
zcmXwvIZFdk6op@O+@r>QOU#s(lS%S2!BT8QPz%Kcg&AjJrI5xVRTK^?99*!N!cG&2
zsEr^I5u21YB4}f<vGNB9mOg|O=YIDbzI=5zkXJe0*RCp=y&Zx9unw#THLw9}1e?HS
zumx-d+rS{$4t9W@U<m92yTKl?7wiN3!2xg(90G^I5ikr!z|lKKgT)Xk%ZJ(U_vHD?
zR%-6`Yoc5#MyrJ}=}9wVr%X#a(utY2nRe}j7kA^HvF=$(CuW(hw53tLp3?Ot&3Dh<
z{g(@UHZ;HSw&{N!OyB2Do{hEJ1>Y#>t9otyt*y%cC_O$cZjVPEoS$6zrl6l{Gg5d$
y3R7f+EmDe>YR-RRs@W=O;VLGS7gt|g(GctES|X{;n4+n6sT?Vc^3kQ9)&2mGS9cTu

delta 339
zcmXwvO-lk%6o#)geQIS{_N95DP0(hXJL5P6(J~DBSQbQ#bKTU+9}rk@z{Lv*k^X>2
zuxQ%p?1cIS{Q#qVQ1}zNMsYar;k?gN>0L)EYHL+3==hIUAVdg5gkge47$J-j#t7qt
z3Bn{HN{A7r2-AcaLYy#5m?I<z^MnOLlCVfvA}kYD2&;q?Ax&6oBNJ=JyXm^TNNn#0
zdv5oLeRslEGt=`oOk3(%(=u#B*g4@yOLwJd7rm@4Jx7R=F7mqLN-KOSaDJ@S);B*J
zZ}<E#-f!J)MPu)U=ji1}yZYL1=srK?f9=VCtNinzysy2a&g#kP&Q}=t{8l?Knaw2A
vS(cg1Vutz*CRFBBI*M3|x#|wQBJ-3t@IA$Znv$Y|<yAVrmKEMS@Ur#;*Y|OT

diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
index a1a2207c71b79a4a1292f62967d59a5d15b35099..97121d2e39b1fddeb696df188ced5e989de43aa3 100644
GIT binary patch
delta 99
zcmV-p0G$7v{w19LC6Ig+RcF<0m)?m?xO$PxFkZ4&mt>pPfsloe0fmqPg^&Y<kOZ}m
z1%|I6n^P^TUkQn~#e0LKk|XU{eQR@5&%0j@630a|eRsG1hc>VUhc>VVhc>VWw>Gc{
F=FVNgE~Eee

delta 99
zcmV-p0G$7v{w19LC6Ig+@TiqL3k=;#t_ywNwTQy-kRvPVfsloe0fmqPg^&Y<kOZ}m
z1%|I6ErHv>hg|+;h?vffI1$CI;ABLFpA_v6t?7VfyD}DShc>VUhc>VVhc>VWw>Gc{
F=FW06FFybP

diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
index 5c0283a..b480e60 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+47d014527237639d50ad47bc17dc933e03809ad5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6e62fa7286b6b12a29da4e3d3e0ce85b182d6a60")]
 [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 fc9d417..b2830e2 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9f7598482af7790741aff2df04c132e6b38192646beed507b30d1d426c516070
+8cd7fbdf30baf77c173986a19cc5803e8f0a84750631bb0aeabe5166b42b3225
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
index 5c0283a..b480e60 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+47d014527237639d50ad47bc17dc933e03809ad5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6e62fa7286b6b12a29da4e3d3e0ce85b182d6a60")]
 [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 fc9d417..b2830e2 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9f7598482af7790741aff2df04c132e6b38192646beed507b30d1d426c516070
+8cd7fbdf30baf77c173986a19cc5803e8f0a84750631bb0aeabe5166b42b3225
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
index 8dd6377..7e71ab8 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-5f2b0dcb1b034ff61a7013a0737967c9254fa3a1be0e24ad23d0ec21c2196f67
+fd69829476f96ca4d25120b43521716882b29f08424f3ff35a6ecf0b4441d3a0
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll
index a1ee9be0cf270c9512ba172347421c77fda77f91..8136c0b4b77685d259d802b614dc9525439bc793 100644
GIT binary patch
delta 339
zcmXwvIZFdk6op@O+@r>QOU#s(lS%S2!BT8QPz%Kcg&AjJrI5xVRTK^?99*!N!cG&2
zsEr^I5u21YB4}f<vGNB9mOg|O=YIDbzI=5zkXJe0*RCp=y&Zx9unw#THLw9}1e?HS
zumx-d+rS{$4t9W@U<m92yTKl?7wiN3!2xg(90G^I5ikr!z|lKKgT)Xk%ZJ(U_vHD?
zR%-6`Yoc5#MyrJ}=}9wVr%X#a(utY2nRe}j7kA^HvF=$(CuW(hw53tLp3?Ot&3Dh<
z{g(@UHZ;HSw&{N!OyB2Do{hEJ1>Y#>t9otyt*y%cC_O$cZjVPEoS$6zrl6l{Gg5d$
y3R7f+EmDe>YR-RRs@W=O;VLGS7gt|g(GctES|X{;n4+n6sT?Vc^3kQ9)&2mGS9cTu

delta 339
zcmXwvO-lk%6o#)geQIS{_N95DP0(hXJL5P6(J~DBSQbQ#bKTU+9}rk@z{Lv*k^X>2
zuxQ%p?1cIS{Q#qVQ1}zNMsYar;k?gN>0L)EYHL+3==hIUAVdg5gkge47$J-j#t7qt
z3Bn{HN{A7r2-AcaLYy#5m?I<z^MnOLlCVfvA}kYD2&;q?Ax&6oBNJ=JyXm^TNNn#0
zdv5oLeRslEGt=`oOk3(%(=u#B*g4@yOLwJd7rm@4Jx7R=F7mqLN-KOSaDJ@S);B*J
zZ}<E#-f!J)MPu)U=ji1}yZYL1=srK?f9=VCtNinzysy2a&g#kP&Q}=t{8l?Knaw2A
vS(cg1Vutz*CRFBBI*M3|x#|wQBJ-3t@IA$Znv$Y|<yAVrmKEMS@Ur#;*Y|OT

diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
index a1a2207c71b79a4a1292f62967d59a5d15b35099..97121d2e39b1fddeb696df188ced5e989de43aa3 100644
GIT binary patch
delta 99
zcmV-p0G$7v{w19LC6Ig+RcF<0m)?m?xO$PxFkZ4&mt>pPfsloe0fmqPg^&Y<kOZ}m
z1%|I6n^P^TUkQn~#e0LKk|XU{eQR@5&%0j@630a|eRsG1hc>VUhc>VVhc>VWw>Gc{
F=FVNgE~Eee

delta 99
zcmV-p0G$7v{w19LC6Ig+@TiqL3k=;#t_ywNwTQy-kRvPVfsloe0fmqPg^&Y<kOZ}m
z1%|I6ErHv>hg|+;h?vffI1$CI;ABLFpA_v6t?7VfyD}DShc>VUhc>VVhc>VWw>Gc{
F=FW06FFybP

diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
index 8e0efac..aa97529 100644
--- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
@@ -112,6 +112,22 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue.frx))</OriginalItemSpec>
     </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v1.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\budget_expenditure_report_from_revenue_v1.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v1.frx))</OriginalItemSpec>
+    </StaticWebAsset>
     <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v2.frx))">
       <SourceType>Package</SourceType>
       <SourceId>rmutr_report</SourceId>
diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
index a3269f2..c806e58 100644
--- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -1 +1 @@
-b77baecdf45cb80236438e8a223568cbd6e07fc272289f2130dc9e2d455d9160
+1e00466f0b88109f048610c7645c46c929b7a4dd3b6d32b115f372c65af39b3a
diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index be5b2dd..3627f5f 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17249193125237173
\ No newline at end of file
+17249914374724023
\ No newline at end of file
diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info
index 3627f5f..4e16e27 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17249914374724023
\ No newline at end of file
+17254250168059839
\ 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 250c58f..c847e45 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/28/2024 11:04:45" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="09/04/2024 11:43:00" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -106,18 +106,17 @@
       <TextObject Name="Text3" Top="94.5" Width="75.6" Height="37.8" Text="พื้นที่ :" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม [budget_expenditure_report_from_revenue_v2.academic_year_1] - 30 กันยายน [budget_expenditure_report_from_revenue_v2.academic_year_2] )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue_v2.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <DataBand Name="Data3" Top="213.09" Width="945" Height="28.35" CanShrink="true" DataSource="details">
-        <TextObject Name="Text29" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic5]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
-        <TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
-        <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic2]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="32, 55, 100"/>
+      <DataBand Name="Data3" Top="212.2" Width="945" Height="28.35" CanShrink="true" DataSource="details">
+        <TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
+        <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic2]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold, Underline" TextFill.Color="32, 55, 100"/>
         <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
         <TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
-        <TextObject Name="Text17" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic3]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
+        <TextObject Name="Text17" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic3]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text18" Left="548.1" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount3]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text19" Left="604.8" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text3]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text21" Left="793.8" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text4]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text22" Left="28.35" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no1]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-        <TextObject Name="Text23" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic4]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
+        <TextObject Name="Text23" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic4]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
         <TextObject Name="Text25" Left="595.35" Width="56.7" Height="28.35" Text="  [budget_expenditure_report_from_revenue_v2.details.text5]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text26" Left="642.6" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount6]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text28" Left="66.15" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no2]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -127,20 +126,20 @@
         <TextObject Name="Text33" Left="737.1" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text8]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text39" Left="614.25" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount10]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text34" Left="103.95" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no3]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-        <TextObject Name="Text35" Left="141.75" Width="359.1" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic9]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-        <TextObject Name="Text36" Left="311.85" Width="189" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic10]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+        <TextObject Name="Text35" Left="141.75" Width="359.1" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic9]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+        <TextObject Name="Text36" Left="311.85" Width="189" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic10]" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text37" Left="519.75" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount9]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text38" Left="548.1" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text9]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text40" Left="708.75" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text10]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text41" Left="141.75" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no4]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
         <TextObject Name="Text44" Left="614.25" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text11]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
         <TextObject Name="Text45" Left="179.55" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no5]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text46" Left="217.35" Width="255.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic12]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text46" Left="217.35" Width="255.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic12]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text47" Left="472.5" Width="75.6" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount12]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text49" Left="207.9" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no6][budget_expenditure_report_from_revenue_v2.details.text19]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text50" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic13]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text50" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic13]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text51" Left="472.5" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount13]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text53" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text13]" AutoShrink="FontSize" AutoShrinkMinSize="10" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text53" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text13]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text54" Left="472.5" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text14]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text55" Left="529.2" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text15]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text56" Left="595.35" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text16]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
@@ -149,33 +148,34 @@
         <TextObject Name="Text59" Left="689.85" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount15]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text60" Left="756" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text18]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text61" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount16]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
-        <TextObject Name="Text62" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic14]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
+        <TextObject Name="Text62" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic14]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text63" Left="793.8" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text20]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
-        <TextObject Name="Text42" Left="179.55" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic11]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
-        <TextObject Name="Text64" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic15]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
+        <TextObject Name="Text42" Left="179.55" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic11]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
+        <TextObject Name="Text64" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic15]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no7][budget_expenditure_report_from_revenue_v2.details.text22]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text66" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount17]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text67" Left="793.8" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text21]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text2]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
         <TextObject Name="Text13" Left="869.4" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text1]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
-        <TextObject Name="Text69" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic16]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
         <TextObject Name="Text70" Left="765.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text23]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text71" Left="737.1" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text24]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text72" Left="614.25" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount19]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text27" Left="765.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text6]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text24" Left="548.1" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount5]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text43" Left="519.75" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount11]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
-        <TextObject Name="Text68" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic17]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
+        <TextObject Name="Text68" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic17]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
         <TextObject Name="Text52" Left="529.2" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.unit]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text48" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text12]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text20" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount4]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text73" Left="642.6" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount18]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text74" Left="170.1" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no9][budget_expenditure_report_from_revenue_v2.details.text26]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
-        <TextObject Name="Text75" Left="198.45" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic18]" AutoShrink="FontSize" AutoShrinkMinSize="9" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
+        <TextObject Name="Text75" Left="198.45" Width="274.05" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic18]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text77" Left="519.75" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text25]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text76" Left="425.25" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount20]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text78" Left="75.6" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no8]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text79" Left="37.8" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no10]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+        <TextObject Name="Text69" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic16]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
+        <TextObject Name="Text29" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic5]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
       </DataBand>
     </DataBand>
   </ReportPage>