SamSys
|
7b1542d5c6
|
Merge branch 'InsuranceEmployeeShareoCheckout'
|
2025-10-29 11:11:52 +03:30 |
|
SamSys
|
7f3f785e39
|
InsuranceEmployeeShare comput on checkout completed
|
2025-10-28 19:10:31 +03:30 |
|
|
|
8134216a4a
|
feat: update roll call links to use dynamic domain
|
2025-10-27 16:46:09 +03:30 |
|
SamSys
|
3d013cfa60
|
compute insuranceEmployeeShare on checkout
|
2025-10-27 16:41:02 +03:30 |
|
syntax24
|
dbddccf011
|
add inew permission admin > workflow > institution-contract
|
2025-10-19 23:06:14 +03:30 |
|
|
|
7c4cf1e2ed
|
feat: add edit laws and regulations link to the menu
|
2025-10-13 15:14:24 +03:30 |
|
|
|
5cde26e7f3
|
fix: update dashboard links to use Next URLs
|
2025-10-13 08:00:20 +03:30 |
|
|
|
b576a8dd6b
|
Merge branch 'Main'
|
2025-10-11 20:01:46 +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 |
|
|
|
db225fea18
|
feat: add "Not Created" tab and implement related functionality in InsuranceList page
|
2025-10-09 12:27:20 +03:30 |
|
|
|
fc1258e985
|
Merge branch 'Feature/Leave/add-invalid-leave' into Main
|
2025-10-07 14:11:32 +03:30 |
|
SamSys
|
5a7f233568
|
checkout dailyWage bug fixed
|
2025-10-02 14:22:48 +03:30 |
|
SamSys
|
f4c3aa1889
|
Except Personnel checkoutChange
|
2025-10-02 13:03:29 +03:30 |
|
|
|
983f629cd6
|
Merge branch 'Feature/admin-dashboard/migrate-next' into Main
|
2025-10-01 14:03:19 +03:30 |
|
|
|
136a9775ea
|
Merge branch 'Feature/contracting-party/modify-apis' into Main
|
2025-10-01 12:20:40 +03:30 |
|
SamSys
|
d0928804ee
|
new permission to DailyWageReport btn on Contract list
|
2025-09-30 22:05:12 +03:30 |
|
SamSys
|
67f199e86f
|
merge from master
|
2025-09-30 21:37:19 +03:30 |
|
|
|
2d0365bc6e
|
Add insurance Job and workshop details
|
2025-09-30 12:23:37 +03:30 |
|
|
|
914a7def53
|
feat: add condition for left personnel for laon installment
|
2025-09-28 14:47:33 +03:30 |
|
|
|
7777ad52de
|
create workshop permission
|
2025-09-25 13:06:39 +03:30 |
|
|
|
b8b8d9c3c4
|
set account permission in EditWorkshop
|
2025-09-25 12:47:04 +03:30 |
|
SamSys
|
b9ff14757b
|
new tab permission code
|
2025-09-25 12:26:38 +03:30 |
|
|
|
518719a6b8
|
Merge branch 'Feature/admin-dashboard/api' into Main
|
2025-09-21 11:04:17 +03:30 |
|
SamSys
|
20dbd0121f
|
Merge From Master
|
2025-09-16 03:01:02 +03:30 |
|
|
|
8eded713da
|
fix: update gender handling in Create and CreateEmployee views
|
2025-09-15 16:12:17 +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 |
|
MahanCh
|
369757aebe
|
Merge branch 'Feature/Ticket/Add-Api' into Main
|
2025-09-07 14:30:54 +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
|
7772bff9f4
|
fix bug
|
2025-08-27 18:08:24 +03:30 |
|
MahanCh
|
83a251ad3b
|
feat: update menu links for institution contracts and payment gateway
|
2025-08-27 17:39:37 +03:30 |
|
MahanCh
|
df39072944
|
feat: add employee mandatory hours to print layouts and view models
|
2025-08-26 13:52:21 +03:30 |
|
MahanCh
|
6f8ced3192
|
feat: enhance print layout for employee attendance details
|
2025-08-26 12:25:14 +03:30 |
|
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
|
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
|
49b84b50a5
|
add dailywage select on create contract front
|
2025-08-18 05:33:31 +03:30 |
|
MahanCh
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|
SamSys
|
93c72e16e7
|
Computing OverTimeWork WithOut Leaves - AbsenceDeduction changed to zero
|
2025-08-09 14:21:22 +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
|
94aa4fda51
|
Merge branch 'master' into Main
|
2025-08-05 17:57:38 +03:30 |
|
MahanCh
|
a71433f751
|
add AmountConflict in checkout
|
2025-08-05 13:11:12 +03:30 |
|
SamSys
|
68d1a8d9fe
|
financialStament transaction list bug fixed
|
2025-08-05 04:16:15 +03:30 |
|
