2097 Commits

Author SHA1 Message Date
b62cbd1a75 Employee Module – Unnecessary space between contact icons and contact number 2025-09-01 09:26:21 +00:00
b1f6306f23 Merge pull request 'Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory.' (#361) from Kartik_Bug#978 into Issues_Aug_2W
Reviewed-on: #361
Merged
2025-09-01 09:25:20 +00:00
3c9dd1595a Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory. 2025-09-01 09:25:20 +00:00
d9456db01e Merge pull request 'Cancel button not closing All fields popup in masters' (#362) from Kartik_Bug#979 into Issues_Aug_2W
Reviewed-on: #362
Merged
2025-09-01 09:23:29 +00:00
79e23fef24 The bottom border of the Master dropdown is not visible. 2025-09-01 09:23:29 +00:00
f569ed635c Cancel button not closing All fields popup in masters 2025-09-01 09:23:29 +00:00
dca4691032 Merge pull request 'The calendar icon should display correctly when we increase the zoom.' (#363) from Kartik_Bug#973 into Issues_Aug_2W
Reviewed-on: #363
Merged
2025-09-01 09:22:42 +00:00
fa878642b6 The calendar icon should display correctly when we increase the zoom. 2025-09-01 09:22:42 +00:00
a1c3af9073 Merge pull request 'Attendance Record Popup Shows Wrong Date Format' (#364) from Kartik_Bug#1024 into Issues_Aug_2W
Reviewed-on: #364
Merged
2025-09-01 09:19:03 +00:00
f433e55a96 Changes in date format in Attendance logs and attendance. 2025-09-01 09:19:03 +00:00
833a54e57a Attendance Record Popup Shows Wrong Date Format 2025-09-01 09:19:03 +00:00
8bce930028 Merge pull request 'Expense Module – Default date range filter hides all records on page load' (#365) from Kartik_Bug#955 into Issues_Aug_2W
Reviewed-on: #365
Merged
2025-09-01 09:11:17 +00:00
047d0241bd Expense Module – Default date range filter hides all records on page load 2025-09-01 09:11:17 +00:00
e71debe932 Merge pull request 'The Tenant filter does not close when navigating to another component.' (#366) from Kartik_Bug#1028 into Issues_Aug_2W
Reviewed-on: #366
Merged
2025-09-01 09:10:38 +00:00
1a77cc809a The Tenant filter does not close when navigating to another component. 2025-09-01 09:10:38 +00:00
73c6ccc0d6 Merge pull request 'Filter Applied Without Clicking on "Apply" Button in Daily Progress Report' (#367) from Kartik_Bug#1037 into Issues_Aug_2W
Reviewed-on: #367
Merged
2025-09-01 08:56:20 +00:00
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
aaa97532a4 Merge pull request 'Pagination Displayed Even When Records Are greater Than 20' (#368) from Kartik_Bug#1041 into Issues_Aug_2W
Reviewed-on: #368
Merged
2025-09-01 06:46:37 +00:00
f847e5f07f Remove hardcoded 20 and add ITEMS_PER_PAGE 2025-09-01 12:11:55 +05:30
8c465db8d4 Pagination Displayed Even When Records Are greater Than 20 2025-09-01 10:49:40 +05:30
9dddba4e30 Merge pull request 'Tenant_Manag : Feature #901 : Tenant Management' (#334) from Tenant_Manag into main
Reviewed-on: #334
Merged
2025-08-26 10:05:29 +00:00
d52c4e6ec0 rename of menu item nane 2025-08-26 14:53:06 +05:30
176801c014 fixed frquency range to 0 to 3 2025-08-25 14:54:22 +05:30
275d984ecc fixed cancel button on edit tenant form 2025-08-25 12:57:47 +05:30
ed1e0cd428 updated bill ans plan page 2025-08-25 12:46:48 +05:30
207c2820bf update Ui 2025-08-25 11:58:50 +05:30
fe87ebc859 added valiadtion for Team Size whenever going to upgrade or purchase plan 2025-08-25 11:30:42 +05:30
84837bbe45 removed bg color 2025-08-25 11:26:58 +05:30
3e2d601739 removed unused and added child id 2025-08-24 16:11:20 +05:30
2377a1b869 removed unused code 2025-08-24 16:10:25 +05:30
e1ecaf7a31 added default range set or not flag 2025-08-24 16:09:51 +05:30
33c8b690ef added dynamically master menu 2025-08-24 14:56:50 +05:30
75c81ecc0c added regular date formate and prevent to call api without param. 2025-08-24 14:26:32 +05:30
3fa6e19114 removed console 2025-08-24 13:11:00 +05:30
1aa6016a01 changed appmenu url 2025-08-23 17:55:39 +05:30
b00fc04a82 Merge pull request 'AppMenu : Dynamic Menus' (#356) from AppMenu into Tenant_Manag
Reviewed-on: #356
Merged
2025-08-23 11:57:43 +00:00
d1ff7321e9 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-23 17:25:50 +05:30
fc4715cdd8 Merge branch 'AppMenu' of https://git.marcoaiot.com/admin/marco.pms.web into AppMenu 2025-08-23 17:08:12 +05:30
50ec338d8a handle run time error 2025-08-23 17:06:38 +05:30
f00e3a1a24 initial setup sidebar menus from backend 2025-08-23 17:06:38 +05:30
18390e9368 Merge pull request 'Issues_Aug_1W' (#355) from Issues_Aug_1W into main
Reviewed-on: #355
merged
2025-08-23 11:09:24 +00:00
380effd2f0 changed project source 2025-08-23 14:58:22 +05:30
a01e2deee7 Changes in Regularizationaction. 2025-08-23 13:19:41 +05:30
57eb2ab405 Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
2025-08-23 12:55:35 +05:30
a76cbe8615 handle error msg 2025-08-23 11:21:02 +05:30
006a68f2fe added new loader 2025-08-23 10:33:26 +05:30
49cf94546a changed position of autorenew input field 2025-08-23 10:23:05 +05:30
0cc65fdcfa Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#348) from Kartik_Bug#944 into Issues_Aug_1W
Reviewed-on: #348
Merged
2025-08-23 04:37:20 +00:00
f1bc6bd57d Updation in Employee Suspend and Reactivate employee. 2025-08-23 04:37:20 +00:00
00b73b3d34 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-08-23 04:37:20 +00:00