From 4c94c2e3a7716a39d10b2dbbab02dfa95905c3e1 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 4 Oct 2023 18:55:25 +0700
Subject: [PATCH] bug fixed

---
 Controllers/RoFive.Controller.cs               |  6 ++++++
 wwwroot/reports/summary_income_cooperative.frx | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs
index e9631ca..405ff43 100644
--- a/Controllers/RoFive.Controller.cs
+++ b/Controllers/RoFive.Controller.cs
@@ -4435,6 +4435,12 @@ namespace rmutr_report.Controllers
                     {
                         detail.topic = "รวม "+ projectnames;
                     }
+                    detail.revenue_estimates = sum1;
+                    detail.deduct_expenses_percent60 = sum2;
+                    detail.deduct_expenses_percent10 = sum3;
+                    detail.balance = sum4;
+                    detail.deduct_tuition_fees = sum5;
+                    detail.balance_university = sum6;
                 }
             }
             
diff --git a/wwwroot/reports/summary_income_cooperative.frx b/wwwroot/reports/summary_income_cooperative.frx
index 1006058..dd8bcb7 100644
--- a/wwwroot/reports/summary_income_cooperative.frx
+++ b/wwwroot/reports/summary_income_cooperative.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="09/28/2023 15:57:58" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/04/2023 18:54:57" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="summary_income_cooperative" ReferenceName="summary_income_cooperative" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -43,11 +43,11 @@
           <TableCell Name="Cell211" Border.Lines="All" Fill.Color="255, 255, 153" Text="คงเหลือ สมทบ&#13;&#10;มหาวิทยาลัย" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text84" Left="415.8" Top="75.6" Width="434.7" Height="37.8" Text="คณะ/วิทยาลัย[summary_income_cooperative.faculty_college]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TextObject Name="Text85" Left="850.5" Top="75.6" Width="368.55" Height="37.8" Text="พื้นที่[summary_income_cooperative.area]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text84" Left="415.8" Top="75.6" Width="434.7" Height="37.8" Text="คณะ/วิทยาลัย  [summary_income_cooperative.faculty_college]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text85" Left="850.5" Top="75.6" Width="368.55" Height="37.8" Text="พื้นที่  [summary_income_cooperative.area]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="260.86" Width="1436.4">
-      <DataBand Name="Data4" Top="266.58" Width="1436.4" Height="47.25" DataSource="data">
+    <DataBand Name="Data1" Top="262.56" Width="1436.4">
+      <DataBand Name="Data4" Top="269.96" Width="1436.4" Height="47.25" DataSource="data">
         <TableObject Name="Table19" Width="1436.4" Height="47.25" Border.Lines="All">
           <TableColumn Name="Column161" Width="321.3"/>
           <TableColumn Name="Column162" Width="189"/>
@@ -175,7 +175,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="319.54" Width="1436.4" Height="141.75">
+    <ReportSummaryBand Name="ReportSummary1" Top="324.62" Width="1436.4" Height="141.75">
       <TextObject Name="Text114" Left="926.1" Top="28.35" Width="151.2" Height="37.8" Text="ลงชื่อ" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text116" Left="1077.3" Top="28.35" Width="226.8" Height="37.8" Text="[summary_income_cooperative.maker]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text117" Left="1304.1" Top="28.35" Width="132.3" Height="37.8" Text="ผู้จัดทำ" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>