1980 Commits

Author SHA1 Message Date
5d8a56401d removed search text 2025-08-01 16:29:46 +05:30
daab418873 if expense rejected , created user can edit and submit 2025-08-01 16:29:05 +05:30
ebfb1ab195 handle filter error during network or any 2025-08-01 16:28:25 +05:30
e89177339b chnaged lable name for supplier 2025-08-01 11:26:57 +05:30
b7c4c841e6 removed fuature validation for date, because added flatepick that not allow to select feature date 2025-08-01 10:26:39 +05:30
35f221038d added expenses Reimburse 2025-08-01 00:42:51 +05:30
b30940c2aa Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 2025-07-31 17:35:17 +05:30
e31bb7c487 added search filter and group by 2025-07-31 16:02:15 +05:30
74f532799a Merge pull request 'Issues_July_4W' (#316) from Issues_July_4W into main
Reviewed-on: #316
THis branch is deployed on prodution
2025-07-31 05:53:28 +00:00
b864ed0529 added flatepicker for dates 2025-07-31 08:46:40 +05:30
6fbc0411db dynamically set group by filed 2025-07-30 19:59:17 +05:30
81712a0695 Expense List display group by selected filed 2025-07-30 19:33:01 +05:30
34373b6256 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 2025-07-30 18:36:22 +05:30
506e6ac381 Merge pull request 'fixed : feature date not allow' (#315) from Expense_Bug#828 into Feature_Expense
Reviewed-on: #315
Merged
2025-07-30 12:58:55 +00:00
a40d0b7e58 fixed : feature date not allow 2025-07-30 18:26:01 +05:30
b0e359e428 Change in Team and InfraStructure component when select a project. 2025-07-30 17:32:49 +05:30
b410ec71cc All Projects is shown on Unknown Projects Place. 2025-07-30 16:36:30 +05:30
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
811392448d Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W
Reviewed-on: #313
merged
2025-07-30 09:26:35 +00:00
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
4512c11a60 Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W
Reviewed-on: #309
Merged
2025-07-30 09:04:05 +00:00
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
d6ead0fd4c added label for filter fields 2025-07-30 14:21:32 +05:30
8fa27b8d06 removed unused code 2025-07-30 14:17:27 +05:30
57b9f70f39 removed debugger 2025-07-30 14:16:38 +05:30
b3c7406d0a removed extra padding 2025-07-30 14:16:10 +05:30
95bfacf5f1 Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W
Reviewed-on: #306
Merged
2025-07-30 07:54:06 +00:00
76e290fe79 Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 2025-07-30 07:54:06 +00:00
28e73ca4fb Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 2025-07-30 12:23:28 +05:30
cc2710abdc Merge pull request 'filter_offcanvas : Added Offcanvas Filter Support for All Pages' (#310) from filter_offcanvas into Feature_Expense
Reviewed-on: #310
Merged
2025-07-30 06:48:56 +00:00
2cf7db394d arrange Expense Details columns 2025-07-30 12:07:29 +05:30
1e6603cc7c added one more column for createdAt date 2025-07-30 12:02:11 +05:30
a3313f6c0a fixed action button visibilities 2025-07-30 11:12:56 +05:30
a1682c8a62 Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W
Reviewed-on: #307
Merged
2025-07-29 13:44:47 +00:00
ac8815d674 In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. 2025-07-29 13:44:47 +00:00
697c9acfa6 Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W
Reviewed-on: #308
Merged
2025-07-29 13:33:08 +00:00
a763ec4412 Date Format Not Consistent – Should Always Display DD‑MM‑YYYY 2025-07-29 13:33:08 +00:00
78640e68f9 centralize offcanvas panel handling and make it dynamically configurable per page 2025-07-29 17:32:38 +05:30
9e311ef73c removed unused code 2025-07-29 17:01:58 +05:30
6b6ec37da4 removed parent node, 2025-07-29 16:57:52 +05:30
cc05dbad20 In Contact profile popup Include Delete functionality add. 2025-07-29 16:23:19 +05:30
3464b63588 added edit and delete who can perform action 2025-07-28 14:12:06 +05:30
528d02a703 Changes in Directory card view design. 2025-07-28 13:21:20 +05:30
66f2d4bff6 In Project List page change Filter icon. 2025-07-28 13:10:55 +05:30
e2d45e54a0 hide page if have any permission for Expense 2025-07-28 13:10:18 +05:30
aa14203357 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense 2025-07-28 12:52:36 +05:30
89c6f9c7fc added pDf view 2025-07-28 12:51:09 +05:30