Commit Graph

1203 Commits

Author SHA1 Message Date
MahanCh
77e03f3d7f Merge remote-tracking branch 'origin/master' 2025-08-09 14:45:14 +03:30
MahanCh
a9008beb24 Change CreateAsync For SalaryAid 2025-08-09 14:45:04 +03:30
SamSys
a30d5b68d7 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-09 14:21:30 +03:30
SamSys
93c72e16e7 Computing OverTimeWork WithOut Leaves - AbsenceDeduction changed to zero 2025-08-09 14:21:22 +03:30
MahanCh
290e1639e8 Merge branch 'master' into Main 2025-08-09 14:10:33 +03:30
MahanCh
3650b46b8e fix 404 Error on sending data for checkout exists in SalaryAid 2025-08-09 14:10:12 +03:30
MahanCh
734de19bc2 Merge branch 'master' into Main 2025-08-09 13:32:55 +03:30
MahanCh
398bb35815 Merge remote-tracking branch 'origin/master' 2025-08-09 12:47:18 +03:30
MahanCh
697bd9fefe fix error for "get last personnelCode" 2025-08-09 12:47:04 +03:30
MahanCh
2743493a11 add correct validation for create ContractingPartyBankAccounts 2025-08-09 11:02:32 +03:30
MahanCh
f9de490c13 cors 2025-08-07 17:13:43 +03:30
MahanCh
f374ff3012 PaymentTransaction Get data from it 2025-08-07 15:09:50 +03:30
MahanCh
563fe563c0 fix appsetting bug 2025-08-07 14:29:44 +03:30
MahanCh
c75e3464d7 fix bug 2025-08-07 10:08:56 +03:30
MahanCh
e3a5fb578b Change Payment Instrument api 2025-08-07 10:08:02 +03:30
MahanCh
8cb99b2862 ADD ROUTE 2025-08-07 10:00:28 +03:30
MahanCh
57b2ad3445 test for deploying 2025-08-06 15:30:13 +03:30
SamSys
3befd6f0d9 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-06 15:01:02 +03:30
SamSys
8f10aa54a8 PaidLiveTimeSapn on checkout Footer bug fixed 2025-08-06 15:00:13 +03:30
MahanCh
efbd74479b fix error 2025-08-06 14:23:21 +03:30
MahanCh
8432b2660e Merge branch 'Feature/Chcekout/AddHasConflict' into Main
# Conflicts:
#	ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
2025-08-06 14:11:06 +03:30
MahanCh
2f9426bdaf Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-06 14:07:44 +03:30
MahanCh
5477519464 add extensionAsync in institutionContract for Api 2025-08-06 14:07:12 +03:30
MahanCh
f92257b251 add order by for Get list 2025-08-06 13:49:11 +03:30
MahanCh
5efe58d23d add bank inquiry data from body 2025-08-06 13:40:10 +03:30
MahanCh
648ca44ebb change bank card to bank number 2025-08-06 13:17:12 +03:30
MahanCh
3232c979aa Merge remote-tracking branch 'origin/Main' into Main 2025-08-06 11:47:19 +03:30
MahanCh
ce8a0b397d Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-06 11:37:37 +03:30
MahanCh
c1fcaa1726 add transaction controller and create api
edit institutionContractController.cs and add excel download
2025-08-06 11:37:06 +03:30
Mahan Chamani
e1fd94db04 Update dotnet-developPublish.yml 2025-08-06 11:33:53 +03:30
Mahan Chamani
882f38d000 Update dotnet-developPublish.yml 2025-08-06 11:19:00 +03:30
Mahan Chamani
29560370d8 Update dotnet-developPublish.yml 2025-08-06 10:50:47 +03:30
Mahan Chamani
7841e8c336 Update dotnet-developPublish.yml 2025-08-06 10:41:16 +03:30
Mahan Chamani
a114cc8242 Update dotnet-developPublish.yml 2025-08-06 10:10:22 +03:30
MahanCh
473132d66a change Representative selectList 2025-08-06 09:55:33 +03:30
Mahan Chamani
9124f50577 Update dotnet-developPublish.yml 2025-08-05 18:22:41 +03:30
Mahan Chamani
7a13150223 Update dotnet-developPublish.yml 2025-08-05 18:18:14 +03:30
Mahan Chamani
f7059bcaeb Update dotnet-developPublish.yml 2025-08-05 18:08:18 +03:30
MahanCh
4c4e848f52 Merge branch 'master' into Main 2025-08-05 17:59:54 +03:30
Mahan Chamani
7984f18516 Update dotnet-developPublish.yml 2025-08-05 17:59:11 +03:30
MahanCh
94aa4fda51 Merge branch 'master' into Main 2025-08-05 17:57:38 +03:30
MahanCh
2d2207565e test 2025-08-05 17:55:48 +03:30
Mahan Chamani
3f8b85906f Create dotnet-developPublish.yml 2025-08-05 17:55:18 +03:30
MahanCh
346756c766 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 16:05:54 +03:30
MahanCh
20f208ac0e Add IsActive to group 2025-08-05 16:05:17 +03:30
MahanCh
2b602e4199 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 15:54:46 +03:30
MahanCh
9557f860bb Merge branch 'Feature/ContractingPartyBankAccount/Init' into Main 2025-08-05 15:54:41 +03:30
MahanCh
cf0dc95b5c add create range for ContractingPartyBankAccounts 2025-08-05 15:54:09 +03:30
MahanCh
c7f7b17866 add list create for payment instrument 2025-08-05 15:51:53 +03:30
MahanCh
d9259bf7c4 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 15:21:12 +03:30