diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
index ac74e51..3a3cf83 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue.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="07/13/2023 19:10:42" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/14/2023 16:20:41" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -35,42 +35,40 @@
       </BusinessObjectDataSource>
     </BusinessObjectDataSource>
   </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="400" Watermark.Font="Arial, 60pt">
-    <PageHeaderBand Name="PageHeader1" Width="945" Height="207.9">
-      <TextObject Name="Text1" Width="945" Height="28.35" Text="งบประมาณรายจ่ายจากเงินรายได้ ประปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text2" Top="28.35" Width="945" Height="28.35" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text3" Top="94.5" Width="75.6" Height="37.8" Text="พื้นที่ :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <LineObject Name="Line3" Left="85.05" Top="122.85" Width="425.25" Diagonal="true"/>
-      <TextObject Name="Text4" Top="132.3" Width="94.5" Height="37.8" Text="หน่วยงาน :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text7" Left="85.05" Top="132.3" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.agency_name_th]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <LineObject Name="Line2" Left="85.05" Top="160.65" Width="425.25" Diagonal="true"/>
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="450" Watermark.Font="Arial, 60pt">
+    <DataBand Name="Data2" Width="945" Height="207.9">
+      <LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/>
+      <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
       <TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text8" Left="85.05" Top="170.1" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.sector]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text9" Left="765.45" Top="170.1" Width="132.3" Height="37.8" Text="[budget_expenditure_report_from_revenue.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text10" Left="897.75" Top="170.1" Width="47.25" Height="37.8" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/>
-      <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
-    </PageHeaderBand>
-    <DataBand Name="Data2" Top="213.09" Width="945">
-      <DataBand Name="Data3" Top="218.29" Width="945" Height="28.35" CanShrink="true" DataSource="budgets">
+      <LineObject Name="Line2" Left="85.05" Top="160.65" Width="425.25" Diagonal="true"/>
+      <TextObject Name="Text4" Top="132.3" Width="94.5" Height="37.8" Text="หน่วยงาน :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text7" Left="85.05" Top="132.3" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.agency_name_th]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <LineObject Name="Line3" Left="85.05" Top="122.85" Width="425.25" Diagonal="true"/>
+      <TextObject Name="Text3" Top="94.5" Width="75.6" Height="37.8" Text="พื้นที่ :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" 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.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="budgets">
         <LineObject Name="Line5" Left="727.65" Top="28.35" Width="141.75" Diagonal="true"/>
         <TextObject Name="Text11" Width="226.8" Height="28.35" Text="แผนงานบุคลากรภาครัฐ" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
         <TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
         <TextObject Name="Text13" Left="869.4" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt"/>
-        <DataBand Name="Data4" Top="251.83" Width="945" Height="28.35" DataSource="personnel_list_s">
+        <DataBand Name="Data4" Top="246.64" Width="945" Height="28.35" DataSource="personnel_list_s">
           <LineObject Name="Line6" Left="699.3" Top="28.35" Width="141.75" Diagonal="true"/>
           <TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
           <TextObject Name="Text14" Left="18.9" Width="207.9" Height="28.35" Text="รายการบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
           <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-          <DataBand Name="Data5" Top="285.38" Width="945" Height="28.35" DataSource="budget_personnel_lists">
+          <DataBand Name="Data5" Top="280.18" Width="945" Height="28.35" DataSource="budget_personnel_lists">
             <LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/>
             <TextObject Name="Text20" Left="689.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text17" Left="37.8" Width="207.9" Height="28.35" Text="งบบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
             <TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text19" Left="623.7" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text21" Left="812.7" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-            <DataBand Name="Data6" Top="318.92" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
+            <DataBand Name="Data6" Top="313.73" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
               <LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/>
               <TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
               <TextObject Name="Text23" Left="85.05" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
@@ -78,7 +76,7 @@
               <TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-              <DataBand Name="Data7" Top="352.47" Width="945" Height="28.35" DataSource="budget_rates">
+              <DataBand Name="Data7" Top="347.27" Width="945" Height="28.35" DataSource="budget_rates">
                 <TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text29" Left="122.85" Width="302.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
                 <TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -86,7 +84,7 @@
                 <TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text33" Left="756" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <LineObject Name="Line9" Left="633.15" Top="28.35" Width="122.85" Diagonal="true"/>
-                <DataBand Name="Data1" Top="386.01" Width="945" Height="28.35" DataSource="details">
+                <DataBand Name="Data1" Top="380.82" Width="945" Height="28.35" DataSource="details">
                   <LineObject Name="Line10" Left="633.15" Top="28.35" Width="94.5" Diagonal="true"/>
                   <TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>