2655 Commits

Author SHA1 Message Date
acf6a28191 Merge pull request 'Attendance "No record" message improvement' (#480) from Kartik_Bug#1437 into Issues_Oct_main_2W
Reviewed-on: #480
merged
2025-10-15 12:24:37 +00:00
98c90f2a9b Attendance "No record" message improvement 2025-10-15 12:24:37 +00:00
6e89fbd680 added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-15 17:31:58 +05:30
cc2a82e3f0 Removing error in Contact Filter panel. 2025-10-15 16:56:18 +05:30
b23518f796 Changes in expense filter panel. 2025-10-15 15:58:59 +05:30
9648d1a98b removed console 2025-10-15 15:55:46 +05:30
aa947b791b added paymentadjustment head crud operation 2025-10-15 15:42:30 +05:30
bd6332fa61 Changes in Filter panel. 2025-10-15 14:10:03 +05:30
51cca64dd5 adjust history table whenever select comment tab 2025-10-15 12:55:07 +05:30
57d65a5fe7 Adding Chips in Document, Directory and Expense Page. 2025-10-15 12:46:47 +05:30
ca88928850 added provideAll is flag inside basic projctname api 2025-10-15 12:45:11 +05:30
962286a4da added mark as completd api operation 2025-10-15 12:35:07 +05:30
0b02531909 Adding Table-respnsive in projectNav. 2025-10-15 11:33:09 +05:30
dec15278fa Changes in Emp Attendance and DateRange picker. 2025-10-15 11:00:18 +05:30
76df08e921 integrated editcollection and vew douments 2025-10-14 20:17:48 +05:30
0052fed1e6 integrated comment api added comment and payments history inside view collection 2025-10-14 18:20:36 +05:30
da56c59ac9 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-14 17:40:42 +05:30
d9392c244e Changes in UI of Weigets and show selected project on 2 heading. 2025-10-14 17:29:20 +05:30
a7f1ba97c3 Creating new weidgets in Dashboard in main. 2025-10-14 17:14:06 +05:30
b80af5467c Changes in Infrastructure. 2025-10-14 15:07:07 +05:30
e2035e1fd8 updated payhistory after add payment 2025-10-14 14:28:49 +05:30
7176a86913 Merge pull request 'integrated collection details api' (#485) from collection_dev into Collection_Management
Reviewed-on: #485
Merged
2025-10-14 08:54:29 +00:00
a26e4d1dc2 added skeleton for payment history at add payment form 2025-10-14 08:54:29 +00:00
f91c7d6da1 rmoved console 2025-10-14 08:54:29 +00:00
272645f0b4 integrated collection details api 2025-10-14 08:54:29 +00:00
301684a12b Merge pull request 'collection_dev' (#482) from collection_dev into Collection_Management
Reviewed-on: #482
merged
2025-10-14 04:55:41 +00:00
9288ac1fbc successfuuly fetch data and create collection 2025-10-14 10:24:45 +05:30
376a2a397f intergrated get list and create collection 2025-10-14 00:21:19 +05:30
58c2fbdf1b initiallly setup 2025-10-13 17:15:59 +05:30
9592108472 Removing extra margin-top on Project-details. 2025-10-13 16:35:28 +05:30
3b032b7b07 Merge pull request 'Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams' (#475) from Kartik_Bug#1455 into Issues_Oct_main_2W
Reviewed-on: #475
merged
2025-10-13 09:33:09 +00:00
b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams 2025-10-13 09:33:09 +00:00
01568db61c Merge pull request '“NA” Should Be Displayed When Employee Has No Email Instead of “–”' (#476) from Kartik_Bug#1451 into Issues_Oct_main_2W
Reviewed-on: #476
Merged
2025-10-13 09:32:51 +00:00
80a974e3be “NA” Should Be Displayed When Employee Has No Email Instead of “–” 2025-10-13 09:32:51 +00:00
f3e05a11d6 Merge pull request 'Adding Project and Service field in View Organization popup.' (#477) from Kartik_Task#1477 into Issues_Oct_main_2W
Reviewed-on: #477
Merged
2025-10-13 09:32:32 +00:00
222e6495a8 Adding Project and Service field in View Organization popup. 2025-10-13 09:32:32 +00:00
18a3b8a85b Merge pull request 'Filter Sidebar Should Auto-Close When Navigating to Another Page' (#478) from Kartik_Bug#1450 into Issues_Oct_main_2W
Reviewed-on: #478
merged
2025-10-13 09:32:17 +00:00
d75296ffe8 Filter Sidebar Should Auto-Close When Navigating to Another Page 2025-10-13 14:51:47 +05:30
6649cab6a2 Added cursor-not-allowed when user can delete the organization. 2025-10-13 14:16:11 +05:30
eab23389ed Correction in Projects Completion Status in this weidget data cannot be shown. 2025-10-13 12:51:42 +05:30
12b632f087 added new api for list of org 2025-10-11 18:06:51 +05:30
6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. 2025-10-11 17:48:25 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
8fd4e7f3f1 added space between first and last name 2025-10-11 16:30:27 +05:30
aca2decb00 clear fully cache after remove session 2025-10-11 16:26:04 +05:30
f7f4b68997 changed reimburse data during transaction to current date 2025-10-11 15:09:04 +05:30
f839613066 Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main
Reviewed-on: #474
Merged
2025-10-11 08:42:26 +00:00
b58bd33774 added requested b and requested at column inside rgularization 2025-10-11 14:08:27 +05:30
136bc94c5b removed dbugger and add new classes 2025-10-11 13:12:23 +05:30
281a956ac8 fixed directory header layout 2025-10-11 12:43:37 +05:30