Commit Graph

983 Commits

Author SHA1 Message Date
MahanCh
785309c731 fix leave date comparison logic in LeaveRepository 2025-08-12 11:55:13 +03:30
MahanCh
2547fec258 Merge branch 'Feature/AdminMonthlyOverview/AddEmployeeOption' 2025-08-11 13:06:19 +03:30
MahanCh
acb572d94a fix admin monthly overview bug 2025-08-11 13:05:55 +03:30
MahanCh
d1b7e0c3e1 changes 2025-08-09 15:15:38 +03:30
MahanCh
9c0d5b65be comment condition for one month ago for creating salaryAid 2025-08-09 15:13:43 +03:30
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
3650b46b8e fix 404 Error on sending data for checkout exists in SalaryAid 2025-08-09 14:10:12 +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
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
Mahan Chamani
7984f18516 Update dotnet-developPublish.yml 2025-08-05 17:59:11 +03:30
Mahan Chamani
3f8b85906f Create dotnet-developPublish.yml 2025-08-05 17:55:18 +03:30
MahanCh
55dc4c891f fix bug 2025-08-05 15:19:40 +03:30
MahanCh
6d6ce93f74 some changes 2025-08-05 14:25:32 +03:30
SamSys
68d1a8d9fe financialStament transaction list bug fixed 2025-08-05 04:16:15 +03:30
SamSys
a1dfc17ce9 static checkout fridayPay bug fixed 2025-08-04 18:17:35 +03:30
MahanCh
b70dbc8a6b Merge remote-tracking branch 'origin/master' 2025-08-04 11:04:13 +03:30
MahanCh
a34d81318b order payment transactions by creation date 2025-08-04 11:03:10 +03:30
SamSys
00357df859 test 2025-08-04 05:00:13 +03:30
MahanCh
8da9f09663 add debt alert for users who don't have permissions 2025-07-31 14:09:16 +03:30
SamSys
6c814d5dce add new static account 2025-07-30 19:42:25 +03:30
MahanCh
e3f29e5efa change header login button 2025-07-29 17:14:51 +03:30
MahanCh
13278e2c24 fix: change the route of jquery mask in Admin new 2025-07-29 14:13:10 +03:30
MahanCh
5ca32bbbaf Add Redirect If the User is Authenticated in Home Screen 2025-07-29 14:06:38 +03:30
SamSys
3ea80c1344 merge api to master 2025-07-28 23:26:36 +03:30
MahanCh
5ae31b9cea add "debt" section for mobile 2025-07-28 16:17:53 +03:30
SamSys
0d06457e1f Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-28 14:45:27 +03:30
SamSys
bdc433b0a3 employee children delet bug fixed 2025-07-28 14:45:17 +03:30
MahanCh
e87733f5cb Add Client Menu changes and add "debt" section in header 2025-07-28 14:20:36 +03:30
MahanCh
60bd120196 add main page and commented "register" buttons 2025-07-28 12:43:00 +03:30
MahanCh
0a41751c15 Merge branch 'master' into Api 2025-07-28 11:55:12 +03:30
MahanCh
41f39fb6fa FIX: fix WeeklyOffDays Select On Null Error 2025-07-28 11:53:08 +03:30
MahanCh
e8fd8bdace change the menu for new items 2025-07-28 11:39:53 +03:30
MahanCh
9f2487f8ef add new menu Items 2025-07-27 17:40:30 +03:30
MahanCh
32dbd094e0 Feat: Add Condition For FinancialStatmentRepository.cs to set balance 0 when amount searched 2025-07-27 17:15:20 +03:30
MahanCh
313579cdee add fake api - disable employeeReport in Menu 2025-07-27 13:16:21 +03:30
MahanCh
3bda7116a2 Merge branch 'refs/heads/Feature/ContractingPartyBankAccount/Init' into Api
# Conflicts:
#	.gitignore
2025-07-27 12:19:04 +03:30
MahanCh
8bb29447e2 add .idea Folder to .gitignore 2025-07-27 11:32:46 +03:30
SamSys
8dc839f561 financialStatment row Balance bug fixed 2025-07-26 20:39:56 +03:30
SamSys
9f9c0d64a9 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-26 16:05:32 +03:30
SamSys
751c1a4131 change checkout footer [TotalPresent and TotalWorking] 2025-07-26 16:05:25 +03:30
MahanCh
b96ed1c7c3 Feat:init ContractingPartyBankAccount Module 2025-07-26 15:58:01 +03:30
MahanCh
500d7fc8d4 fix style bugs 2025-07-26 11:44:21 +03:30
MahanCh
b8cfc8eb56 fix menu bug problem 2025-07-24 11:30:41 +03:30
MahanCh
4c0f4bb70c Merge branch 'Api' of https://github.com/syntax24/OriginalGozareshgir into Api 2025-07-24 11:27:42 +03:30
MahanCh
6317ebb079 Merge branch 'master' into Api 2025-07-24 11:26:29 +03:30