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 @@
-
-
+
+