From 133651f7643fb5e3e0e0b45bab83ccf563a9ffee Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Thu, 13 Jul 2023 18:00:36 +0700
Subject: [PATCH] fixed

---
 Models/budget/budget_expenditure_report_from_revenue.cs    | 2 +-
 wwwroot/reports/budget_expenditure_report_from_revenue.frx | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Models/budget/budget_expenditure_report_from_revenue.cs b/Models/budget/budget_expenditure_report_from_revenue.cs
index bbb56f7..6304972 100644
--- a/Models/budget/budget_expenditure_report_from_revenue.cs
+++ b/Models/budget/budget_expenditure_report_from_revenue.cs
@@ -5,7 +5,7 @@ namespace rmutr_report.Models
     public class budget_expenditure_report_from_revenue
     {
         public string academic_year_name_th { get; set; }
-        public string start_and_end_date_report { get; set; }
+        //public string start_and_end_date_report { get; set; }
         public string sector { get; set; } //ภาค
 
         //public string revenue_estimates_type { get; set; }
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
index 9033a84..b1a0b9a 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/13/2023 17:47:52" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/13/2023 17:55:52" 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"/>
-      <Column Name="start_and_end_date_report" DataType="System.String"/>
       <Column Name="sector" DataType="System.String"/>
       <Column Name="parent_agency_name" DataType="System.String"/>
       <Column Name="agency_name_th" DataType="System.String"/>
@@ -39,7 +38,7 @@
   <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="210" 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="( [budget_expenditure_report_from_revenue.start_and_end_date_report] )" 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"/>