174 Commits

Author SHA1 Message Date
82f173c0ed changed veriable name expensesCategoryId to expenseCategoryId and passes properly param. for list api 2025-11-06 08:55:55 +05:30
33256981da recover , misssing code during resloving merged 2025-11-06 00:21:57 +05:30
1ca1f15422 use 2025-11-05 23:29:09 +05:30
84ed1984d7 Merge branch 'Recurring_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Recurring_Expense 2025-11-05 23:13:07 +05:30
324ad05771 Adding API for EDIT in Recurring Expense. 2025-11-05 21:36:03 +05:30
bac9f25df1 added advance payment api 2025-11-05 20:10:19 +05:30
daaebf919d added New Expense after Payment Request done 2025-11-05 15:17:07 +05:30
c63b13f200 fetched latest data 2025-11-05 12:13:34 +05:30
9b65c12239 Merge branch 'Recurring_Expense' into upgrade_Expense 2025-11-05 12:09:37 +05:30
10ec11a828 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Recurring_Expense 2025-11-05 12:04:14 +05:30
69e60caf23 initially setup delete request 2025-11-04 19:36:30 +05:30
e868d27d5f Implementing Get and Update API in Recurring Expense. 2025-11-04 18:34:00 +05:30
0dc68eb20d fixed file uploading and payee 2025-11-04 17:15:42 +05:30
7a749b14e9 Impleting Create API for Recurring Expense. 2025-11-04 17:03:27 +05:30
d02b14272f added acion api t update status 2025-11-03 20:25:41 +05:30
1c4384a62e Adding Filter Get api and delete modal open. 2025-11-03 17:12:24 +05:30
859eaa747f Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-03 16:56:49 +05:30
871daf6036 added api Get Advance Payment 2025-11-03 14:48:42 +05:30
f3cfb3cf24 adding api for get list for payment request. 2025-11-03 12:50:06 +05:30
c123373892 Adding Create API for Payment Request. 2025-11-01 17:10:47 +05:30
196069b39a Creating APi for Create Payemnt Request. 2025-11-01 16:00:00 +05:30
394d28f80d integrated collection mang. completely 2025-10-17 15:17:48 +05:30
7f33d5e6bd Attendance Tab Should Display All Records for Each Employee 2025-10-08 13:38:09 +00:00
0511ed6d82 Changes in Attendance module for all projects. 2025-10-08 13:52:06 +05:30
bc933f4c64 Adding Search box in Expense Paid by dropdown. 2025-10-08 11:29:51 +05:30
997971629f addd Expense By project 2025-10-04 11:08:19 +05:30
78808ecac0 added Expensebstatus widget, fixed small bugs 2025-10-03 19:07:44 +05:30
25f4f1e7a7 added expense analysis card inisde dashboard 2025-10-02 13:10:14 +05:30
2aff3b9e80 changed logins api 2025-09-30 19:35:01 +05:30
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
397020ccb4 Merge pull request 'Creating a Services in Master Compoenents.' (#408) from Master_Services into Organization_Management
Reviewed-on: #408
2025-09-22 05:00:06 +00:00
71932ea6dc Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419) from Kartik_Task_Infra#1265 into Organization_Management
Reviewed-on: #419
2025-09-22 04:07:58 +00:00
693cabf63d Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management
Reviewed-on: #420
2025-09-22 04:07:09 +00:00
b9b3788dda configured tenant level login 2025-09-21 18:59:34 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
aee510f527 revert pramod changed - (tenant login mistake 2025-09-21 16:58:29 +05:30
7e6020e3db Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-21 16:42:26 +05:30
afcd1934f9 Integrate the API for Work Area and fetch data filtered by serviceId. 2025-09-21 15:10:31 +05:30
Pramod
070fa93fca initially setup login 2025-09-21 10:06:38 +05:30
a0f7e5c57b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259 2025-09-20 19:32:41 +05:30
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30