CelHRTeam/CEL_Payroll
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

20260806-2930 Need to change title "Bonus & Other Allowance" to "Bonus" at fIncometaxCertificate #8

Open
shahadat wants to merge 1 commits from dev_shahadat into devqc
pull from: dev_shahadat
merge into: CelHRTeam:devqc
Conversation 0 Commits 1 Files Changed 2 +24 -3
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1649dcebb6 - Show all commits

23
Payroll.Service/Tax/DA/IncomeTaxDA.cs
View File

@ -385,6 +385,27 @@ namespace Payroll.Service
internal static DataSet GetTaxCertificate(TransactionContext tc, string empNo, int taxParamId) 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( string sql = SQLParser.MakeSQL(@"SELECT * FROM(
SELECT CASE it.DESCRIPTION SELECT CASE it.DESCRIPTION
WHEN 'Basic Salary' THEN 'Basic' WHEN 'Basic Salary' THEN 'Basic'
@ -397,7 +418,7 @@ namespace Payroll.Service
AND it.TAXPARAMID=%n AND it.TAXPARAMID=%n
AND it.ItemCode IN(-201,-203,-205,-222) AND it.ItemCode IN(-201,-203,-205,-222)
UNION 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 WHERE it.EMPLOYEEID=e.EMPLOYEEID
AND e.EMPLOYEENO=%s AND e.EMPLOYEENO=%s
AND it.TAXPARAMID=%n AND it.TAXPARAMID=%n

4
Payroll.UI/Payroll.UI/App.config
View File

@ -7,8 +7,8 @@
<section name="InformationForReportTool" type="Ease.SearchTools.Objects.InformationForReportToolConfigHandler, Ease.SearchTools.Objects"/> <section name="InformationForReportTool" type="Ease.SearchTools.Objects.InformationForReportToolConfigHandler, Ease.SearchTools.Objects"/>
</configSections> </configSections>
<dbSettings> <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=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=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"/>--> <!--<connection name="conn" provider="sql" connectionString="server=WIN-D48IJC70V70;Database=GPPayroll;integrated security=yes;" sqlSyntax="SQL"/>-->
</dbSettings> </dbSettings>