This commit is contained in:
@@ -2736,15 +2736,7 @@ namespace rmutr_report.Controllers
|
|||||||
indetail.row_no1 = no1;
|
indetail.row_no1 = no1;
|
||||||
no1++;
|
no1++;
|
||||||
}
|
}
|
||||||
// if (indetail.topic_type==4&& indetail.topic=="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ")
|
|
||||||
// {
|
|
||||||
//
|
|
||||||
// indetail.row_no1 = null;
|
|
||||||
// indetail.amount6 = indetail.value1;
|
|
||||||
// indetail.text5 = null;
|
|
||||||
// indetail.amount5 =null;
|
|
||||||
// indetail.text6 = "บาท";
|
|
||||||
// }
|
|
||||||
if (indetail.topic_type==5)
|
if (indetail.topic_type==5)
|
||||||
{
|
{
|
||||||
indetail.topic5 = indetail.topic;
|
indetail.topic5 = indetail.topic;
|
||||||
@@ -2755,22 +2747,13 @@ namespace rmutr_report.Controllers
|
|||||||
indetail.row_no2 = no2;
|
indetail.row_no2 = no2;
|
||||||
no2++;
|
no2++;
|
||||||
}
|
}
|
||||||
// if (indetail.topic_type==5&& indetail.topic=="ค่าตอบแทน")
|
|
||||||
// {
|
|
||||||
//
|
|
||||||
// indetail.topic5 = indetail.topic;
|
|
||||||
// indetail.amount7 = null;
|
|
||||||
// indetail.amount8 = indetail.value1;
|
|
||||||
// indetail.text7 = null;
|
|
||||||
// indetail.text8 = "บาท";
|
|
||||||
// indetail.row_no2 = null;
|
|
||||||
// }
|
|
||||||
if (indetail.topic_type==6)
|
if (indetail.topic_type==6)
|
||||||
{
|
{
|
||||||
indetail.topic9 = indetail.topic;
|
indetail.topic9 = indetail.topic;
|
||||||
indetail.topic10 = indetail.qualification;
|
indetail.topic10 = indetail.qualification;
|
||||||
indetail.amount9 = indetail.value1;
|
indetail.amount9 = indetail.value1;
|
||||||
indetail.amount10 = indetail.value2*12;
|
indetail.amount10 = indetail.value2;
|
||||||
indetail.text9 = "อัตรา";
|
indetail.text9 = "อัตรา";
|
||||||
indetail.text10 = "บาท";
|
indetail.text10 = "บาท";
|
||||||
indetail.row_no3 = no3;
|
indetail.row_no3 = no3;
|
||||||
@@ -2808,7 +2791,6 @@ namespace rmutr_report.Controllers
|
|||||||
indetail.amount13 = indetail.value1;
|
indetail.amount13 = indetail.value1;
|
||||||
indetail.amount14 = indetail.value2;
|
indetail.amount14 = indetail.value2;
|
||||||
indetail.amount15 = indetail.value3;
|
indetail.amount15 = indetail.value3;
|
||||||
//indetail.amount16 = indetail.value4;
|
|
||||||
indetail.text18 = "บาท";
|
indetail.text18 = "บาท";
|
||||||
indetail.text19 = ".";
|
indetail.text19 = ".";
|
||||||
indetail.row_no6 = no6;
|
indetail.row_no6 = no6;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+be506637963d971c493b17d48cff9051e6c1e186")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+28053412e780bc3285cdba6f9429908f29b578e1")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
bb854ecd343ad1946095299c5eea83cbf1d92adfdf83d66497b41101e0ce62e3
|
c930d5c248796f391f6acd0016fb66ad32d9e616e81b02e67616561e4789b2b0
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
17235282175005895
|
17241552033399582
|
||||||
Reference in New Issue
Block a user