Commit Graph

356 Commits

Author SHA1 Message Date
MahanCh
f7db92c4a7 fix leave duration bug fix 2025-04-20 19:54:58 +03:30
MahanCh
3896b3cec1 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-04-19 18:56:58 +03:30
MahanCh
4064d5fdf8 mahan access to backup 2025-04-19 18:56:51 +03:30
SamSys
52e1d0a78b TemporaryClientRegistration - TaxAdded 2025-04-19 16:05:17 +03:30
SamSys
b5affa43c1 Merge From Upload/Dad-Mehr to master 2025-04-17 16:16:29 +03:30
MahanCh
6b7c3730ad fix loan fine and reward style bug 2025-04-16 20:41:17 +03:30
SamSys
b627311d73 Merge From Feature/File/Session 2025-04-16 20:23:43 +03:30
MahanCh
9cc62d76c2 change side bar names 2025-04-16 20:06:25 +03:30
MahanCh
6422218409 fix reward bug in description 2025-04-16 20:05:58 +03:30
MahanCh
9eb9c0d49a fix bugs for employees select list 2025-04-16 20:05:21 +03:30
MahanCh
cc740439ec get the employees select2 changes 2025-04-16 20:04:57 +03:30
MahanCh
ff15307160 fix salaryAid color bug 2025-04-16 17:27:49 +03:30
MahanCh
f2a2afc7a4 fix sidebar bugs 2025-04-16 17:14:23 +03:30
MahanCh
fe2a70bf60 merge task schedule with file for orginal publish 2025-04-16 17:02:14 +03:30
MahanCh
d52141f729 fix 2025-04-16 15:50:35 +03:30
MahanCh
1915dc0565 fix rollcall bug and reward desc bug 2025-04-16 15:30:20 +03:30
MahanCh
4cc0e72136 add validation for file operations 2025-04-16 15:01:44 +03:30
MahanCh
535e3943eb fix file alerts 2025-04-16 14:50:53 +03:30
SamSys
e8efb0a579 merge from feature/file/session 2025-04-15 23:58:04 +03:30
SamSys
8800af7647 Commented 2025-04-15 23:52:07 +03:30
SamSys
8ec9f5daef TemporaryClientRegister 2025-04-15 23:51:13 +03:30
MahanCh
e625ed9a6e fix alert bug 2 2025-04-15 21:22:19 +03:30
MahanCh
39ffd52107 fix alert bug 2025-04-15 21:22:07 +03:30
MahanCh
6dbf6c2008 fix file session bug 2025-04-15 16:56:18 +03:30
MahanCh
00a85e54ee remove operation result 2025-04-15 15:06:17 +03:30
SamSys
f5195ecaa2 Control + k + d on TemporaryClientRegistrationApplication 2025-04-14 21:48:12 +03:30
SamSys
aaa3618522 File Excel 2025-04-14 21:46:31 +03:30
SamSys
9376c2cca6 comentted while 2025-04-14 21:32:15 +03:30
SamSys
36480df2f5 TemporaryClientRegistration - InstitutionContractTemp 2025-04-14 21:30:15 +03:30
MahanCh
60db153dfe finish list of files 2025-04-14 20:24:55 +03:30
MahanCh
4ffdf14de2 add excel export for file page 2025-04-14 16:02:51 +03:30
SamSys
fa587c61eb file1 bug fixed - merge from fil-bug-fix brach 2025-04-13 23:41:09 +03:30
SamSys
7e35f8009a add new account to staticWorkshopAccount 2025-04-13 23:21:45 +03:30
MahanCh
13080fd64c Merge branch 'Feature/Main/Header' into Upload/Dad-mehr 2025-04-13 22:55:04 +03:30
MahanCh
39eb401575 add loan details 2025-04-13 22:51:21 +03:30
SamSys
bcd6447509 BaseYearPay bug Fixed YearlySalery 2025-04-13 22:49:43 +03:30
MahanCh
ac46886922 add grouping search for loan reward SA fine 2025-04-13 22:23:25 +03:30
MahanCh
252c601eb4 fix some bugs 2025-04-13 19:36:38 +03:30
SamSys
4f673f22d5 merge from Delete-bug-after-openning-Create-modal into master 2025-04-13 16:54:58 +03:30
SamSys
d4a80f5b87 TemporaryClientRegister -ReviewAndPayment 2025-04-13 16:51:38 +03:30
MahanCh
0c73ac44e8 fix delete bug in customize checkout 2025-04-13 16:45:14 +03:30
MahanCh
059624ff9f fix year and month on creating checkout unofficial 2025-04-13 16:30:09 +03:30
MahanCh
a792936d66 FIx SideBar and add currentDay css 2025-04-12 11:15:54 +03:30
SamSys
a99e1cef32 merge from customize-chekout-header 2025-04-10 14:39:23 +03:30
SamSys
408a78fb27 merge from master 2025-04-10 14:38:03 +03:30
SamSys
6f7eb05047 TemporaryClientRegister - Chekout-Bonuses Bug Fixed 2025-04-10 14:23:39 +03:30
SamSys
03ee772974 TemporaryClientRegister - Compelet edcreatWorkshopTemp 2025-04-09 19:18:00 +03:30
MahanCh
a0cab667c4 merge from task schedule 2025-04-09 19:13:46 +03:30
MahanCh
53ece03000 fix task schedule bug 2025-04-09 19:12:45 +03:30
MahanCh
3354e0343c fix case history bug 2025-04-09 19:08:10 +03:30