SamSys
|
10e7400611
|
test moda completed
|
2025-11-02 19:11:04 +03:30 |
|
SamSys
|
23c99e60d5
|
ClassificationEmployee add to group or edit membrize completed
|
2025-10-26 19:10:20 +03:30 |
|
SamSys
|
490393acbc
|
ClassficationScheme > EditSalariesAndCoefficient front completed
|
2025-10-25 01:32:09 +03:30 |
|
SamSys
|
c6874b33cf
|
ClassificationSalariestab and create front completed
|
2025-10-19 23:11:39 +03:30 |
|
SamSys
|
596e21b712
|
craetejobs modal front
|
2025-10-14 04:21:50 +03:30 |
|
SamSys
|
e9c3176dfc
|
change createjobe modal
|
2025-10-12 00:04:33 +03:30 |
|
SamSys
|
4a956a1397
|
createJobs load modal
|
2025-10-11 16:04:46 +03:30 |
|
SamSys
|
fc3053dd17
|
Merge branch 'master' into WorskhopClassifiedPlan
|
2025-10-11 15:10:12 +03:30 |
|
|
|
7a58423eb3
|
feat: implement "GetNotCreatedWorkshop" method and update related functionality in InsuranceList
|
2025-10-09 14:30:09 +03:30 |
|
|
|
70164ae498
|
feat: add "GetNotCreatedWorkshop" method to InsuranceList functionality
|
2025-10-09 13:47:43 +03:30 |
|
SamSys
|
849369fea3
|
GroupAndJobs tab Query
|
2025-10-08 17:41:23 +03:30 |
|
SamSys
|
283f66ab32
|
Merge branch 'master' into WorskhopClassifiedPlan
|
2025-10-07 17:36:14 +03:30 |
|
SamSys
|
abf00884a4
|
Create ClassificationGroup With CreateScheme - EditScheme
|
2025-10-07 01:38:01 +03:30 |
|
|
|
dbbee73e2a
|
add is invalid to list - NOT FINISHED
|
2025-10-06 20:07:32 +03:30 |
|
|
|
21df40af3b
|
add isInvalid to leave entity - set query filter for it
|
2025-10-06 19:50:42 +03:30 |
|
SamSys
|
a3dc27f08e
|
SchemeTab, create scheme , scheme list
|
2025-10-06 13:26:36 +03:30 |
|
SamSys
|
055ce2b2a7
|
merge from master
|
2025-10-04 16:35:11 +03:30 |
|
|
|
8fb10ba5b0
|
add validation for leave
|
2025-10-01 16:32:58 +03:30 |
|
SamSys
|
67f199e86f
|
merge from master
|
2025-09-30 21:37:19 +03:30 |
|
SamSys
|
bfa8688c38
|
Merge branch 'master' into WorskhopClassifiedPlan
|
2025-09-30 00:15:53 +03:30 |
|
|
|
914a7def53
|
feat: add condition for left personnel for laon installment
|
2025-09-28 14:47:33 +03:30 |
|
SamSys
|
66c903045f
|
ClassiicationChemeApplication
|
2025-09-23 18:49:56 +03:30 |
|
SamSys
|
20dbd0121f
|
Merge From Master
|
2025-09-16 03:01:02 +03:30 |
|
SamSys
|
c3cb3df3d3
|
change compute leaving model on checkout
|
2025-09-13 06:29:25 +03:30 |
|
SamSys
|
f9947dc138
|
change leaving time on checkout for EndOfyear or OnLeftWork Employees
|
2025-09-09 18:41:16 +03:30 |
|
SamSys
|
ca350aa795
|
delete test files
|
2025-09-08 00:40:17 +03:30 |
|
SamSys
|
1daaeff194
|
test 2
|
2025-09-07 05:29:07 +03:30 |
|
SamSys
|
9cd00a1886
|
test
|
2025-09-07 05:25:46 +03:30 |
|
SamSys
|
29fed23805
|
Checkout NEW Compute DailyWage Completed
|
2025-09-02 04:33:30 +03:30 |
|
SamSys
|
a26f079969
|
merge from master to manualDailyWage
|
2025-08-31 17:20:27 +03:30 |
|
SamSys
|
7e3f7d1dcf
|
Completed DailYWage and BaseYear report For Contract
|
2025-08-28 06:09:02 +03:30 |
|
MahanCh
|
df39072944
|
feat: add employee mandatory hours to print layouts and view models
|
2025-08-26 13:52:21 +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
|
856ed38f08
|
Merge branch 'master' into ManualDailyWageContractSide
|
2025-08-21 01:49:27 +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 |
|
SamSys
|
c04a8f86a4
|
new metod To Compute Spreation BaseYear
|
2025-08-15 15:49:35 +03:30 |
|
MahanCh
|
b77538218f
|
add conflict indicator for employee customize checkout records
|
2025-08-12 11:17:02 +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
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|
MahanCh
|
a9008beb24
|
Change CreateAsync For SalaryAid
|
2025-08-09 14:45:04 +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
|
5477519464
|
add extensionAsync in institutionContract for Api
|
2025-08-06 14:07:12 +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 |
|
MahanCh
|
473132d66a
|
change Representative selectList
|
2025-08-06 09:55:33 +03:30 |
|
MahanCh
|
2b602e4199
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
|
2025-08-05 15:54:46 +03:30 |
|
