SamSys
|
8f76b8c082
|
Upgraded daillyWage Completed
|
2025-08-24 03:37:54 +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
|
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 |
|
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 |
|