2931 Commits

Author SHA1 Message Date
867ee92151 Adding popup in employees for ManageReporting. 2025-11-11 11:11:13 +05:30
1195cae2d7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy 2025-11-11 09:45:48 +05:30
4eecaf0509 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 18:54:01 +05:30
d82f405e08 changed Expense view u 2025-11-10 18:53:47 +05:30
a37c6b32cb Changing label in Create Payment Request. 2025-11-10 18:31:13 +05:30
9e18dda02f Adding End Date at the view Recurring Expense. 2025-11-10 17:08:23 +05:30
b016f4a523 UI updation at recurring expense. 2025-11-10 17:04:28 +05:30
081b042308 corrected signal key 2025-11-10 16:27:26 +05:30
ca4d57cdc0 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 16:10:45 +05:30
ec9bcd1ea5 added validation for Tax , base amount, and added signal for PR and Recurring 2025-11-10 16:10:18 +05:30
00e74b645c Ui alignment in Recurring Expense and Payment Request page. 2025-11-10 16:00:28 +05:30
26675d61c3 UI correction at Collection form. 2025-11-10 15:36:17 +05:30
78faab1b1e Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:58:34 +05:30
6982bb9d77 added heading for PR and Expense Modal 2025-11-10 12:58:30 +05:30
2e49a61aab Changing Date in Expense list grouping. 2025-11-10 12:44:13 +05:30
3723f05a38 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:40:33 +05:30
bc6a935e95 modify view of PR 2025-11-10 12:40:29 +05:30
717d215d8e handle UI to look sliker and add missing images 2025-11-10 12:30:16 +05:30
6531eb7576 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 11:50:00 +05:30
c52cbb1435 Adding End Date in Recurring Expense Popup and adding i icon on it. 2025-11-10 11:49:56 +05:30
b86bf204a9 add landing page 2025-11-10 11:36:32 +05:30
30615e4bba login page swaper added 2025-11-10 11:28:51 +05:30
dad9551e52 add images
(cherry picked from commit 34b0fa3d43d45e67098ce768f30a00fca0a72925)
2025-11-10 11:24:58 +05:30
449de6edba added new attribute - disabled 2025-11-10 10:15:13 +05:30
34b0fa3d43 add images 2025-11-10 10:06:09 +05:30
c14dc3d765 prevent calling unnecessary call during logout and fixed currency displaying in update form 2025-11-08 21:32:35 +05:30
e7fcfdb154 added Advance Payment 2025-11-08 16:07:09 +05:30
b35c39ca36 removed unsused 2025-11-08 15:42:00 +05:30
2b5858a885 removed unused code 2025-11-08 15:38:51 +05:30
04806c6d53 fixed error - building image 2025-11-08 15:34:59 +05:30
0dac797e21 upadated recurringList after create 2025-11-08 15:22:24 +05:30
5a7c6a29ba added recurring payment 2025-11-08 15:20:53 +05:30
40cb641428 added Create Expense action - inSequence of PaymentRequest 2025-11-08 14:29:17 +05:30
587fb420fd migrated PR from upgrade_Expense 2025-11-08 12:53:24 +05:30
2f70b83548 added route and initially setup of payment-request 2025-11-08 09:24:45 +05:30
1058b223b0 removed console and debugger 2025-11-08 09:13:11 +05:30
6f228ed5f1 added currency,rename of ExpenseType to expenseCategory - hooks,( expenseCategoryIds = fileter object) 2025-11-08 09:10:35 +05:30
6a97dcf5f6 added initially expense 2025-11-07 18:15:45 +05:30
dcbb4a3997 fixed DatePicker size issue 2025-11-07 16:47:51 +05:30
7b2bb4d59a Merge branch 'Issues_Oct_4W_V1' into migrate_main 2025-11-07 15:17:58 +05:30
f6ea489a0e removed unwanted code 2025-11-07 15:15:24 +05:30
3259a1ba81 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Payment_Getway_Management 2025-11-07 14:56:27 +05:30
57850acd63 Merge pull request 'Progress Bar Misalignment in Project Widgets on Dashboard' (#497) from Kartik_Bug_V1#1539 into Issues_Oct_4W_V1
Reviewed-on: #497
Merged
2025-11-07 09:22:44 +00:00
3204602b25 Progress Bar Misalignment in Project Widgets on Dashboard 2025-11-07 09:22:44 +00:00
034859e88b Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Oct_4W_V1 2025-11-07 14:51:05 +05:30
a656907695 migrated suscripton onfield to main sub-branch 2025-11-07 14:47:09 +05:30
5f2a567600 Document Filter should close automatically when navigating to another menu from Project Profile page 2025-11-07 12:51:28 +05:30
9ef1e39041 Changes in Directory card and Notes view at the UI. 2025-11-07 12:34:57 +05:30
c3d1b46861 Increasing some gap in document view button and uploaded by and approved at. 2025-11-07 11:43:22 +05:30
2596739fc5 Giving some extra gap in document view form. 2025-11-07 11:36:27 +05:30