This commit is contained in:
@@ -2770,7 +2770,7 @@ namespace rmutr_report.Controllers
|
||||
indetail.topic9 = indetail.topic;
|
||||
indetail.topic10 = indetail.qualification;
|
||||
indetail.amount9 = indetail.value1;
|
||||
indetail.amount10 = indetail.value2;
|
||||
indetail.amount10 = indetail.value2*indetail.value1;
|
||||
indetail.text9 = "อัตรา";
|
||||
indetail.text10 = "บาท";
|
||||
indetail.row_no3 = no3;
|
||||
@@ -2847,6 +2847,8 @@ namespace rmutr_report.Controllers
|
||||
no8++;
|
||||
}
|
||||
}
|
||||
|
||||
budget.total = budget.details.Where(f=>f.topic_type==1).Sum(d => d.amount1);
|
||||
var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };
|
||||
|
||||
Report report = new Report();
|
||||
|
||||
@@ -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+1301ecaeca8b11468450927aa7dd4e89884d9ab9")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad7e631bf7e42daeec9b6a95f26c164545940a8b")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1 +1 @@
|
||||
8dc64ff8016cc4e4a4cc2f7796990f628d2815ca6f83df04926c9688dfe6c632
|
||||
a306e0787253414ac78b021754a61c89956f46a0bc6e3ccde2346272350fa1c1
|
||||
|
||||
Reference in New Issue
Block a user