|
|
5ec938cce9
|
added signalr
|
2025-08-04 15:49:32 +05:30 |
|
|
|
0f5473bddd
|
removed debugger
|
2025-08-04 15:12:08 +05:30 |
|
|
|
96e4760345
|
changed employee api for manage expense
|
2025-08-04 15:11:12 +05:30 |
|
|
|
68bd0d6bb5
|
added expense status logs
|
2025-08-04 12:37:18 +05:30 |
|
|
|
1e26b1261c
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses
|
2025-08-02 22:17:17 +05:30 |
|
|
|
5a209ae24e
|
Merge pull request 'HofixedIssues_July_4W' (#322) from HofixedIssues_July_4W into main
Reviewed-on: #322
Merged
|
2025-08-02 16:17:38 +00:00 |
|
|
|
99418e4870
|
prevent to open windo altert when geolocation not allow
|
2025-08-02 19:04:14 +05:30 |
|
|
|
a056561773
|
changed label of employee to "Reimburse By"
|
2025-08-02 18:42:54 +05:30 |
|
|
|
6b640ee682
|
added padding
|
2025-08-02 18:26:31 +05:30 |
|
|
|
07e4c827f3
|
changed date format and add padding inside expense page card
|
2025-08-02 18:26:17 +05:30 |
|
|
|
aece14d013
|
added callBack hook
|
2025-08-02 17:22:49 +05:30 |
|
|
|
03fb762f24
|
prevent to select checkout before check in time
|
2025-08-02 17:12:22 +05:30 |
|
|
|
543b1bf94b
|
revert changes fo July_4W
|
2025-08-02 17:01:17 +05:30 |
|
|
|
01ce4c92b6
|
revert changed from July_4W
|
2025-08-02 16:43:57 +05:30 |
|
|
|
e0f130e6a6
|
user can not select reimburseDate before transaction date
|
2025-08-01 18:39:03 +05:30 |
|
|
|
28fb1c9387
|
correct draft id
|
2025-08-01 16:56:35 +05:30 |
|
|
|
82a5df36a0
|
handle action when expense rejected
|
2025-08-01 16:30:08 +05:30 |
|
|
|
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 |
|
