From 1649dcebb6dcb953dc395265ab66712535f12f87 Mon Sep 17 00:00:00 2001
From: Shahadat Hossain <shahadathossain@celimited.com>
Date: Thu, 6 Aug 2026 11:57:11 +0600
Subject: [PATCH] 20260806-2930 Need to change title "Bonus & Other Allowance"
 to "Bonus" at fIncometaxCertificate

---
 Payroll.Service/Tax/DA/IncomeTaxDA.cs | 23 ++++++++++++++++++++++-
 Payroll.UI/Payroll.UI/App.config      |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Payroll.Service/Tax/DA/IncomeTaxDA.cs b/Payroll.Service/Tax/DA/IncomeTaxDA.cs
index 0f63572..ecdb15b 100644
--- a/Payroll.Service/Tax/DA/IncomeTaxDA.cs
+++ b/Payroll.Service/Tax/DA/IncomeTaxDA.cs
@@ -385,6 +385,27 @@ namespace Payroll.Service
 
         internal static DataSet GetTaxCertificate(TransactionContext tc, string empNo, int taxParamId)
         {
+            //string sql = SQLParser.MakeSQL(@"SELECT * FROM(
+            //                                SELECT CASE it.DESCRIPTION
+            //                                WHEN 'Basic Salary' THEN 'Basic'
+            //                                WHEN 'House Rent Allowance' THEN 'House'
+            //                                WHEN 'Conveyance Allowance' THEN 'Conveyance'
+            //                                WHEN 'Medical Allowance' THEN 'Medical'
+            //                                END Description,it.TOTALAMOUNT Amount, position FROM INCOMETAXYEARLY it,employee e 
+            //                                WHERE it.EMPLOYEEID=e.EMPLOYEEID
+            //                                AND e.EMPLOYEENO=%s
+            //                                AND it.TAXPARAMID=%n
+            //                                AND it.ItemCode IN(-201,-203,-205,-222)
+            //                                 UNION 
+            //                                 SELECT 'Bonus & other allowance',SUM(it.TOTALAMOUNT) Amount, 200 position FROM INCOMETAXYEARLY it,employee e 
+            //                                WHERE it.EMPLOYEEID=e.EMPLOYEEID
+            //                                AND e.EMPLOYEENO=%s
+            //                                AND it.TAXPARAMID=%n
+            //                                AND it.ItemCode IN(-213, -224)
+            //                                ) tab1
+            //                                ORDER BY position
+            //                                ", empNo, taxParamId, empNo, taxParamId);
+            //return tc.ExecuteDataSet(sql);
             string sql = SQLParser.MakeSQL(@"SELECT * FROM(
                                             SELECT CASE it.DESCRIPTION
                                             WHEN 'Basic Salary' THEN 'Basic'
@@ -397,7 +418,7 @@ namespace Payroll.Service
                                             AND it.TAXPARAMID=%n
                                             AND it.ItemCode IN(-201,-203,-205,-222)
                                              UNION 
-                                             SELECT 'Bonus & other allowance',SUM(it.TOTALAMOUNT) Amount, 200 position FROM INCOMETAXYEARLY it,employee e 
+                                             SELECT 'Bonus',SUM(it.TOTALAMOUNT) Amount, 200 position FROM INCOMETAXYEARLY it,employee e 
                                             WHERE it.EMPLOYEEID=e.EMPLOYEEID
                                             AND e.EMPLOYEENO=%s
                                             AND it.TAXPARAMID=%n
diff --git a/Payroll.UI/Payroll.UI/App.config b/Payroll.UI/Payroll.UI/App.config
index 63717ea..9127a5b 100644
--- a/Payroll.UI/Payroll.UI/App.config
+++ b/Payroll.UI/Payroll.UI/App.config
@@ -7,8 +7,8 @@
     <section name="InformationForReportTool" type="Ease.SearchTools.Objects.InformationForReportToolConfigHandler, Ease.SearchTools.Objects"/>
   </configSections>
   <dbSettings>
-	  <connection name="conn" provider="sql" connectionString="server=cel80;Database=CELPayroll;User ID=CELPayroll;password=4B06094270245E4D5B63" sqlSyntax="SQL"/>
-	  <!--<connection name="conn" provider="sql" connectionString="server=103.197.204.164,1718;Database=CELPayrol;User ID=Easeuser;Password=EaSeuSeR2025" sqlSyntax="SQL"/>-->
+	  <!--<connection name="conn" provider="sql" connectionString="server=cel80;Database=CELPayroll;User ID=CELPayroll;password=4B06094270245E4D5B63" sqlSyntax="SQL"/>-->
+	  <connection name="conn" provider="sql" connectionString="server=103.197.204.164,1718;Database=CELPayrol;User ID=Easeuser;Password=EaSeuSeR2025" sqlSyntax="SQL"/>
 
 	  <!--<connection name="conn" provider="sql" connectionString="server=WIN-D48IJC70V70;Database=GPPayroll;integrated security=yes;" sqlSyntax="SQL"/>-->
   </dbSettings>
-- 
2.40.0.windows.1