Commit Graph

770 Commits

Author SHA1 Message Date
db225fea18 feat: add "Not Created" tab and implement related functionality in InsuranceList page 2025-10-09 12:27:20 +03:30
9095ed28e1 fix invalid bug 2025-10-07 17:20:48 +03:30
7b3d1f527c feat: integrate "IsInvalid" filter and dropdown functionality in leave management 2025-10-07 12:51:18 +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
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
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
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
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
58c015b151 fix: remove unnecessary whitespace in development environment check 2025-09-07 17:22:01 +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
b2a70bc5a9 merge add-employee-avrage [EmployeeMandatoryHours ] 2025-08-31 16:23:39 +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
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
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
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
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
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
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