SamSys
|
85936cad63
|
gozareshgir address and phone changed
|
2025-09-29 05:11:05 +03:30 |
|
SamSys
|
6f805d9abe
|
add enamd logo
|
2025-09-28 18:33:09 +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
|
04710e321a
|
Merge branch 'master' of https://git.dadmehrg.ir/gozareshgir/OriginalGozareshgir
|
2025-09-25 12:26:46 +03:30 |
|
SamSys
|
b9ff14757b
|
new tab permission code
|
2025-09-25 12:26:38 +03:30 |
|
|
|
f387d0c535
|
fix create pay bug
|
2025-09-24 15:38:47 +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
|
58c015b151
|
fix: remove unnecessary whitespace in development environment check
|
2025-09-07 17:22:01 +03:30 |
|
SamSys
|
b2a70bc5a9
|
merge add-employee-avrage [EmployeeMandatoryHours ]
|
2025-08-31 16:23:39 +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 |
|
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
|
5e7bfe0634
|
fix: improve case history data handling and add debugging logs
|
2025-08-23 16:22:26 +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
|
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 |
|
MahanCh
|
b92aaaffa0
|
fix: enable and manage customize checkout options in client menu
|
2025-08-18 11:55:34 +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
|
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
|
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
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +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
|
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
|
f9de490c13
|
cors
|
2025-08-07 17:13:43 +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
|
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
|
2f9426bdaf
|
Merge branch 'Feature/InstitutionContract/Create-Api' into Main
|
2025-08-06 14:07:44 +03:30 |
|
MahanCh
|
5477519464
|
add extensionAsync in institutionContract for Api
|
2025-08-06 14:07:12 +03:30 |
|
MahanCh
|
5efe58d23d
|
add bank inquiry data from body
|
2025-08-06 13:40:10 +03:30 |
|
