MahanCh
|
6f8ced3192
|
feat: enhance print layout for employee attendance details
|
2025-08-26 12:25:14 +03:30 |
|
SamSys
|
c40b457d1f
|
Merge branch 'master' into ManualDailyWageContractSide
|
2025-08-26 01:49:05 +03:30 |
|
SamSys
|
f7166ca17f
|
bug fixed : workshopTime setting save on client
|
2025-08-25 18:56:35 +03:30 |
|
MahanCh
|
a7b7bfc745
|
feat: add grouping SVG and update image reference in rollcall
|
2025-08-25 15:03:39 +03:30 |
|
MahanCh
|
fa5e079db5
|
fix: update image references for contract and insurance sections
|
2025-08-25 14:31:24 +03:30 |
|
MahanCh
|
ec2defab69
|
feat: add employee mandatory hours to checkout model and database
|
2025-08-25 10:33:43 +03:30 |
|
SamSys
|
a344c3f3a6
|
Merge branch 'master' into ManualDailyWageContractSide
|
2025-08-24 03:45:58 +03:30 |
|
SamSys
|
8f76b8c082
|
Upgraded daillyWage Completed
|
2025-08-24 03:37:54 +03:30 |
|
MahanCh
|
5e7bfe0634
|
fix: improve case history data handling and add debugging logs
|
2025-08-23 16:22:26 +03:30 |
|
MahanCh
|
2732ec09b2
|
fix: sort payment transactions by creation date
|
2025-08-23 13:11:10 +03:30 |
|
MahanCh
|
13d93b3e1d
|
fix: handle null card numbers in payment transaction list
|
2025-08-23 13:02:03 +03:30 |
|
MahanCh
|
7ce2142517
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs
|
2025-08-23 11:54:09 +03:30 |
|
MahanCh
|
98146b4aa7
|
fix: calculate balance correctly in financial transaction details
|
2025-08-23 11:53:08 +03:30 |
|
MahanCh
|
5f65c13b45
|
fix: calculate balance correctly in financial transaction details
|
2025-08-23 11:51:46 +03:30 |
|
SamSys
|
584425b3af
|
and new metod to upgrade dailyWage
|
2025-08-23 07:09:56 +03:30 |
|
SamSys
|
2f60883ea2
|
add new prop to contractTable - compute dailyWage
|
2025-08-23 04:27:04 +03:30 |
|
SamSys
|
da8579d2a6
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-22 01:07:04 +03:30 |
|
SamSys
|
41503101b6
|
create rollcallservice transaction chnages
|
2025-08-22 00:58:42 +03:30 |
|
syntax24
|
1cd4cd4b49
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-21 16:46:56 +03:30 |
|
syntax24
|
7afa112e63
|
appsettings.dev changes
|
2025-08-21 16:46:40 +03:30 |
|
SamSys
|
3aa5668696
|
CustomizeCheckout enable or disable on client menu bug fixed
|
2025-08-21 16:44:51 +03:30 |
|
SamSys
|
df1e6f62b8
|
new manualdailywage metod to create contract
|
2025-08-21 15:55:53 +03:30 |
|
SamSys
|
856ed38f08
|
Merge branch 'master' into ManualDailyWageContractSide
|
2025-08-21 01:49:27 +03:30 |
|
SamSys
|
13ebe2fc2a
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-20 03:33:11 +03:30 |
|
SamSys
|
54fbbc964f
|
change OvertTimeWOrking Compute - Send EmployeeMandatoryHours To Save
|
2025-08-20 03:27:54 +03:30 |
|
SamSys
|
4a3515ad65
|
manualDailyWage frontEnd Completed
|
2025-08-20 02:52:06 +03:30 |
|
MahanCh
|
b92aaaffa0
|
fix: enable and manage customize checkout options in client menu
|
2025-08-18 11:55:34 +03:30 |
|
SamSys
|
49b84b50a5
|
add dailywage select on create contract front
|
2025-08-18 05:33:31 +03:30 |
|
SamSys
|
b82456f172
|
chnages
|
2025-08-15 16:22:27 +03:30 |
|
SamSys
|
c04a8f86a4
|
new metod To Compute Spreation BaseYear
|
2025-08-15 15:49:35 +03:30 |
|
MahanCh
|
e0f7ff5ec7
|
Merge branch 'Feature/Chcekout/AddHasConflict'
|
2025-08-13 16:29:49 +03:30 |
|
MahanCh
|
873a30ecd1
|
enhance tooltip initialization and clean up code structure
|
2025-08-13 15:51:41 +03:30 |
|
MahanCh
|
c91df337d4
|
refactor checkout process to simplify salary aid conflict handling
|
2025-08-13 15:27:39 +03:30 |
|
MahanCh
|
b88cda4007
|
fix logic for employee checkout validation in AdminMonthlyOverviewRepository
|
2025-08-13 13:18:21 +03:30 |
|
MahanCh
|
366ad25a3a
|
add conflict indication for salary aids in checkout process
|
2025-08-12 12:44:48 +03:30 |
|
MahanCh
|
463e4bc080
|
Merge branch 'refs/heads/master' into Feature/Chcekout/AddHasConflict
|
2025-08-12 12:43:12 +03:30 |
|
MahanCh
|
785309c731
|
fix leave date comparison logic in LeaveRepository
|
2025-08-12 11:55:13 +03:30 |
|
MahanCh
|
f0126d365d
|
add HasAmountConflict column to CustomizeCheckoutTemps and CustomizeCheckouts
|
2025-08-12 11:17:43 +03:30 |
|
MahanCh
|
b77538218f
|
add conflict indicator for employee customize checkout records
|
2025-08-12 11:17:02 +03:30 |
|
MahanCh
|
e877aca832
|
Merge branch 'Main' into Feature/Chcekout/AddHasConflict
|
2025-08-12 09:56:50 +03:30 |
|
MahanCh
|
f66293a637
|
add id to finacialtransaction viewmodel
|
2025-08-11 16:30:19 +03:30 |
|
MahanCh
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +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
|
5ff08ebb2f
|
fix error for payment transactions
|
2025-08-10 11:20:31 +03:30 |
|
MahanCh
|
fd122fe582
|
fix error
|
2025-08-10 11:08:59 +03:30 |
|
MahanCh
|
25903856b2
|
add has conflict in List for checkout
|
2025-08-10 11:02:16 +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
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|